From ce74dc074355dcf8db9bd0c09ee2624089d3c3e7 Mon Sep 17 00:00:00 2001 From: Barry Wardell Date: Fri, 29 Sep 2006 20:04:36 +0000 Subject: Cleaner implementation of the recent OSX simulator build fix. No need to define SHARED_FLAG in each Makefile. Just have configure create it in the root Makefile instead. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11095 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/Makefile | 6 ------ apps/plugins/chessbox/Makefile | 6 ------ apps/plugins/databox/Makefile | 6 ------ apps/plugins/doom/Makefile | 11 ++++------- apps/plugins/mpegplayer/Makefile | 6 ------ apps/plugins/pacbox/Makefile | 6 ------ apps/plugins/rockboy/Makefile | 6 ------ apps/plugins/searchengine/Makefile | 6 ------ apps/plugins/sudoku/Makefile | 6 ------ apps/plugins/zxbox/Makefile | 6 ------ 10 files changed, 4 insertions(+), 61 deletions(-) (limited to 'apps/plugins') diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile index adc7895da0..975aa7106c 100644 --- a/apps/plugins/Makefile +++ b/apps/plugins/Makefile @@ -13,12 +13,6 @@ INCLUDES = $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I$(FIRMDIR)/c CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(EXTRA_DEFINES) \ -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN -ifeq ($(UNAME), Darwin) -SHARED_FLAG=-dynamiclib -Wl,-single_module -else -SHARED_FLAG=-shared -endif - ifdef APPEXTRA INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) endif diff --git a/apps/plugins/chessbox/Makefile b/apps/plugins/chessbox/Makefile index 9d13a2e12d..b79b0eae70 100644 --- a/apps/plugins/chessbox/Makefile +++ b/apps/plugins/chessbox/Makefile @@ -12,12 +12,6 @@ INCLUDES = -I$(APPSDIR) -I.. -I. $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR) CFLAGS = $(GCCOPTS) -O2 $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN -ifeq ($(UNAME), Darwin) -SHARED_FLAG=-dynamiclib -Wl,-single_module -else -SHARED_FLAG=-shared -endif - ifdef APPEXTRA INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) endif diff --git a/apps/plugins/databox/Makefile b/apps/plugins/databox/Makefile index dba5597c8d..e47ae1e839 100644 --- a/apps/plugins/databox/Makefile +++ b/apps/plugins/databox/Makefile @@ -12,12 +12,6 @@ INCLUDES = -I$(APPSDIR) -I.. -I. $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR) CFLAGS = $(INCLUDES) $(GCCOPTS) -O3 $(TARGET) $(EXTRA_DEFINES) \ -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN -ifeq ($(UNAME), Darwin) -SHARED_FLAG=-dynamiclib -Wl,-single_module -else -SHARED_FLAG=-shared -endif - ifdef APPEXTRA INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) endif diff --git a/apps/plugins/doom/Makefile b/apps/plugins/doom/Makefile index a94a26a544..678e283427 100644 --- a/apps/plugins/doom/Makefile +++ b/apps/plugins/doom/Makefile @@ -3,7 +3,10 @@ # $Id$ # # $Log$ -# Revision 1.5 2006/09/29 16:15:08 barrywardell +# Revision 1.6 2006/09/29 20:04:35 barrywardell +# Cleaner implementation of the recent OSX simulator build fix. No need to define SHARED_FLAG in each Makefile. Just have configure create it in the root Makefile instead. +# +# Revision 1.5 2006-09-29 16:15:08 barrywardell # Allow UI simulator to be build on OS (Slightly updated version of FS5767) # # Revision 1.4 2006-07-27 13:27:19 linus @@ -26,12 +29,6 @@ CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN \ -Wno-strict-prototypes -O2 $(PROFILE_OPTS) -ifeq ($(UNAME), Darwin) -SHARED_FLAG=-dynamiclib -Wl,-single_module -else -SHARED_FLAG=-shared -endif - ifdef APPEXTRA INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) endif diff --git a/apps/plugins/mpegplayer/Makefile b/apps/plugins/mpegplayer/Makefile index 5982884700..215223dafa 100644 --- a/apps/plugins/mpegplayer/Makefile +++ b/apps/plugins/mpegplayer/Makefile @@ -12,12 +12,6 @@ INCLUDES = -I$(APPSDIR) -I.. -I. $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR) CFLAGS = $(INCLUDES) $(GCCOPTS) -O2 $(TARGET) $(EXTRA_DEFINES) \ -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN -ifeq ($(UNAME), Darwin) -SHARED_FLAG=-dynamiclib -Wl,-single_module -else -SHARED_FLAG=-shared -endif - ifdef APPEXTRA INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) endif diff --git a/apps/plugins/pacbox/Makefile b/apps/plugins/pacbox/Makefile index fbff8b5109..174d33f5bb 100644 --- a/apps/plugins/pacbox/Makefile +++ b/apps/plugins/pacbox/Makefile @@ -12,12 +12,6 @@ INCLUDES = -I$(APPSDIR) -I.. -I. $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR) CFLAGS = $(INCLUDES) $(GCCOPTS) -O2 $(TARGET) $(EXTRA_DEFINES) \ -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN -ifeq ($(UNAME), Darwin) -SHARED_FLAG=-dynamiclib -Wl,-single_module -else -SHARED_FLAG=-shared -endif - ifdef APPEXTRA INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) endif diff --git a/apps/plugins/rockboy/Makefile b/apps/plugins/rockboy/Makefile index 91fdf67c31..b849c32dcf 100644 --- a/apps/plugins/rockboy/Makefile +++ b/apps/plugins/rockboy/Makefile @@ -16,12 +16,6 @@ ifdef APPEXTRA INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) endif -ifeq ($(UNAME), Darwin) -SHARED_FLAG=-dynamiclib -Wl,-single_module -else -SHARED_FLAG=-shared -endif - LINKFILE := $(OBJDIR)/link.lds DEPFILE = $(OBJDIR)/dep-rockboy SRC = cpu.c emu.c events.c exports.c fastmem.c hw.c lcd.c lcdc.c loader.c \ diff --git a/apps/plugins/searchengine/Makefile b/apps/plugins/searchengine/Makefile index d397f315f4..bc8f19d136 100644 --- a/apps/plugins/searchengine/Makefile +++ b/apps/plugins/searchengine/Makefile @@ -16,12 +16,6 @@ ifdef APPEXTRA INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) endif -ifeq ($(UNAME), Darwin) -SHARED_FLAG=-dynamiclib -Wl,-single_module -else -SHARED_FLAG=-shared -endif - LINKFILE := $(OBJDIR)/link.lds DEPFILE = $(OBJDIR)/dep-searchengine SRC = searchengine.c parser.c token.c dbinterface.c diff --git a/apps/plugins/sudoku/Makefile b/apps/plugins/sudoku/Makefile index 713d31bcb2..eab09fd5b5 100644 --- a/apps/plugins/sudoku/Makefile +++ b/apps/plugins/sudoku/Makefile @@ -17,12 +17,6 @@ ifdef APPEXTRA INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) endif -ifeq ($(UNAME), Darwin) -SHARED_FLAG=-dynamiclib -Wl,-single_module -else -SHARED_FLAG=-shared -endif - LINKFILE := $(OBJDIR)/link.lds DEPFILE = $(OBJDIR)/dep-sudoku diff --git a/apps/plugins/zxbox/Makefile b/apps/plugins/zxbox/Makefile index 8668c3f4e7..055bf6e967 100644 --- a/apps/plugins/zxbox/Makefile +++ b/apps/plugins/zxbox/Makefile @@ -12,12 +12,6 @@ INCLUDES = -I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(EXTRA_DEFINES) \ -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN $(OPT_FLAGS) $(PROFILE_OPTS) -ifeq ($(UNAME), Darwin) -SHARED_FLAG=-dynamiclib -Wl,-single_module -else -SHARED_FLAG=-shared -endif - ifdef APPEXTRA INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) endif -- cgit v1.2.3