diff options
Diffstat (limited to 'apps/plugins')
| -rw-r--r-- | apps/plugins/doom/doom.make | 2 | ||||
| -rw-r--r-- | apps/plugins/goban/goban.make | 2 | ||||
| -rw-r--r-- | apps/plugins/lua/Makefile | 6 | ||||
| -rw-r--r-- | apps/plugins/lua/lua.make | 2 | ||||
| -rw-r--r-- | apps/plugins/pdbox/pdbox.make | 4 | ||||
| -rw-r--r-- | apps/plugins/pictureflow/pictureflow.make | 2 | ||||
| -rw-r--r-- | apps/plugins/plugins.make | 6 | ||||
| -rw-r--r-- | apps/plugins/zxbox/zxbox.make | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/apps/plugins/doom/doom.make b/apps/plugins/doom/doom.make index 2f52da4..58a4708 100644 --- a/apps/plugins/doom/doom.make +++ b/apps/plugins/doom/doom.make @@ -21,7 +21,7 @@ OTHER_SRC += $(DOOM_SRC) DOOMCFLAGS = $(PLUGINFLAGS) -Wno-strict-prototypes -O2 -fno-strict-aliasing -ifndef SIMVER +ifndef APP_TYPE ifeq ($(TARGET), IRIVER_H100) DOOMCCFLAGS += -mstructure-size-boundary=8 endif diff --git a/apps/plugins/goban/goban.make b/apps/plugins/goban/goban.make index 03f2276..2bc85ad 100644 --- a/apps/plugins/goban/goban.make +++ b/apps/plugins/goban/goban.make @@ -15,7 +15,7 @@ GOBAN_OBJ := $(call c2obj, $(GOBAN_SRC)) OTHER_SRC += $(GOBAN_SRC) -ifndef SIMVER +ifndef APP_TYPE ifneq (,$(strip $(foreach tgt,RECORDER ONDIO,$(findstring $(tgt),$(TARGET))))) ### lowmem targets ROCKS += $(GOBAN_BUILDDIR)/goban.ovl diff --git a/apps/plugins/lua/Makefile b/apps/plugins/lua/Makefile index 6a4e497..09535ac 100644 --- a/apps/plugins/lua/Makefile +++ b/apps/plugins/lua/Makefile @@ -27,7 +27,7 @@ OBJS2 := $(SRC:%.c=$(OBJDIR)/%.o) OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) DIRS = . -ifndef SIMVER +ifndef APP_TYPE ifneq (,$(strip $(foreach tgt,RECORDER ONDIO,$(findstring $(tgt),$(TARGET))))) LDS := archos.lds OUTPUT = $(OUTDIR)/lua.ovl @@ -41,7 +41,7 @@ endif all: $(OUTPUT) -ifndef SIMVER +ifndef APP_TYPE $(OBJDIR)/lua.elf: $(OBJS) $(LINKFILE) $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \ -T$(LINKFILE) -Wl,--gc-sections -Wl,-Map,$(OBJDIR)/lua.map @@ -50,7 +50,7 @@ $(OUTPUT): $(OBJDIR)/lua.elf $(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@ else -ifeq ($(SIMVER), sdl) +ifdef APP_TYPE ################################################### # This is the SDL simulator version diff --git a/apps/plugins/lua/lua.make b/apps/plugins/lua/lua.make index 93139dc..f4dd771 100644 --- a/apps/plugins/lua/lua.make +++ b/apps/plugins/lua/lua.make @@ -15,7 +15,7 @@ LUA_OBJ := $(call c2obj, $(LUA_SRC)) OTHER_SRC += $(LUA_SRC) -ifndef SIMVER +ifndef APP_TYPE ifneq (,$(strip $(foreach tgt,RECORDER ONDIO,$(findstring $(tgt),$(TARGET))))) ### lowmem targets ROCKS += $(LUA_BUILDDIR)/lua.ovl diff --git a/apps/plugins/pdbox/pdbox.make b/apps/plugins/pdbox/pdbox.make index d39d9fd..d2c836f 100644 --- a/apps/plugins/pdbox/pdbox.make +++ b/apps/plugins/pdbox/pdbox.make @@ -22,7 +22,7 @@ $(PDBOXBUILDDIR)/pdbox.rock: $(PDBOX_OBJ) $(MPEG_OBJ) $(CODECDIR)/libtlsf.a PDBOXFLAGS = $(PLUGINFLAGS) PDBOXLDFLAGS = $(PLUGINLDFLAGS) -ifdef SIMVER +ifdef APP_TYPE PDBOXLDFLAGS += -lm endif @@ -36,7 +36,7 @@ $(PDBOXBUILDDIR)/pdbox.rock: $(filter %.o, $^) \ $(filter %.a, $+) \ -lgcc $(PDBOXLDFLAGS) -ifdef SIMVER +ifdef APP_TYPE $(SILENT)cp $*.elf $@ else $(SILENT)$(OC) -O binary $*.elf $@ diff --git a/apps/plugins/pictureflow/pictureflow.make b/apps/plugins/pictureflow/pictureflow.make index 28ad2aa..e3d4544 100644 --- a/apps/plugins/pictureflow/pictureflow.make +++ b/apps/plugins/pictureflow/pictureflow.make @@ -15,7 +15,7 @@ PICTUREFLOW_OBJ := $(call c2obj, $(PICTUREFLOW_SRC)) OTHER_SRC += $(PICTUREFLOW_SRC) -ifndef SIMVER +ifndef APP_TYPE ifneq (,$(strip $(foreach tgt,RECORDER ONDIO,$(findstring $(tgt),$(TARGET))))) ### lowmem targets ROCKS += $(PICTUREFLOW_OBJDIR)/pictureflow.ovl diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make index 4bd0cc9..d3c66c3 100644 --- a/apps/plugins/plugins.make +++ b/apps/plugins/plugins.make @@ -27,7 +27,7 @@ PLUGINLIB_OBJ := $(PLUGINLIB_OBJ:.S=.o) PLUGINLIB_OBJ := $(subst $(ROOTDIR),$(BUILDDIR),$(PLUGINLIB_OBJ)) ### build data / rules -ifndef SIMVER +ifndef APP_TYPE CONFIGFILE := $(FIRMDIR)/export/config/$(MODELNAME).h PLUGIN_LDS := $(APPSDIR)/plugins/plugin.lds PLUGINLINK_LDS := $(BUILDDIR)/apps/plugins/plugin.link @@ -81,7 +81,7 @@ $(BUILDDIR)/apps/plugins/%.o: $(ROOTDIR)/apps/plugins/%.c $(SILENT)mkdir -p $(dir $@) $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PLUGINFLAGS) -c $< -o $@ -ifdef SIMVER +ifdef APP_TYPE PLUGINLDFLAGS = $(SHARED_FLAG) # <-- from Makefile else PLUGINLDFLAGS = -T$(PLUGINLINK_LDS) -Wl,--gc-sections -Wl,-Map,$*.map @@ -94,7 +94,7 @@ $(BUILDDIR)/%.rock: $(filter %.o, $^) \ $(filter %.a, $+) \ -lgcc $(PLUGINLDFLAGS) -ifdef SIMVER +ifdef APP_TYPE $(SILENT)cp $(BUILDDIR)/$*.elf $@ else $(SILENT)$(OC) -O binary $(BUILDDIR)/$*.elf $@ diff --git a/apps/plugins/zxbox/zxbox.make b/apps/plugins/zxbox/zxbox.make index de7312e..a04801a 100644 --- a/apps/plugins/zxbox/zxbox.make +++ b/apps/plugins/zxbox/zxbox.make @@ -15,7 +15,7 @@ ZXBOX_OBJ := $(call c2obj, $(ZXBOX_SRC)) OTHER_SRC += $(ZXBOX_SRC) -ifndef SIMVER +ifndef APP_TYPE ifeq ($(findstring YES, $(call preprocess, $(APPSDIR)/plugins/BUILD_OVERLAY)), YES) ## lowmem targets ROCKS += $(ZXBOX_OBJDIR)/zxbox.ovl |