len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 21:22:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11095 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Barry Wardell 2006-09-29 20:04:36 +00:00
parent 64f949f295
commit ce74dc0743
12 changed files with 10 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/codecs/Makefile
View file

@ -12,12 +12,6 @@ INCLUDES = -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I$(FIRMDIR)/common \
CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET_INC) $(TARGET) $(EXTRA_DEFINES) \ CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET_INC) $(TARGET) $(EXTRA_DEFINES) \
-DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DCODEC -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DCODEC
ifeq ($(UNAME), Darwin)
SHARED_FLAG=-dynamiclib -Wl,-single_module
else
SHARED_FLAG=-shared
endif
ifdef APPEXTRA ifdef APPEXTRA
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
endif endif

6
apps/plugins/Makefile
View file

@ -13,12 +13,6 @@ INCLUDES = $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I$(FIRMDIR)/c
CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(EXTRA_DEFINES) \ CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(EXTRA_DEFINES) \
-DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN
ifeq ($(UNAME), Darwin)
SHARED_FLAG=-dynamiclib -Wl,-single_module
else
SHARED_FLAG=-shared
endif
ifdef APPEXTRA ifdef APPEXTRA
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
endif endif

6
apps/plugins/chessbox/Makefile
View file

@ -12,12 +12,6 @@ INCLUDES = -I$(APPSDIR) -I.. -I. $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR)
CFLAGS = $(GCCOPTS) -O2 $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ CFLAGS = $(GCCOPTS) -O2 $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
-DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN
ifeq ($(UNAME), Darwin)
SHARED_FLAG=-dynamiclib -Wl,-single_module
else
SHARED_FLAG=-shared
endif
ifdef APPEXTRA ifdef APPEXTRA
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
endif endif

6
apps/plugins/databox/Makefile
View file

@ -12,12 +12,6 @@ INCLUDES = -I$(APPSDIR) -I.. -I. $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR)
CFLAGS = $(INCLUDES) $(GCCOPTS) -O3 $(TARGET) $(EXTRA_DEFINES) \ CFLAGS = $(INCLUDES) $(GCCOPTS) -O3 $(TARGET) $(EXTRA_DEFINES) \
-DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN
ifeq ($(UNAME), Darwin)
SHARED_FLAG=-dynamiclib -Wl,-single_module
else
SHARED_FLAG=-shared
endif
ifdef APPEXTRA ifdef APPEXTRA
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
endif endif

11
apps/plugins/doom/Makefile
View file

@ -3,7 +3,10 @@
# $Id$ # $Id$
# #
# $Log$ # $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) # Allow UI simulator to be build on OS (Slightly updated version of FS5767)
# #
# Revision 1.4 2006-07-27 13:27:19 linus # 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 \ -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN \
-Wno-strict-prototypes -O2 $(PROFILE_OPTS) -Wno-strict-prototypes -O2 $(PROFILE_OPTS)
ifeq ($(UNAME), Darwin)
SHARED_FLAG=-dynamiclib -Wl,-single_module
else
SHARED_FLAG=-shared
endif
ifdef APPEXTRA ifdef APPEXTRA
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
endif endif

6
apps/plugins/mpegplayer/Makefile
View file

@ -12,12 +12,6 @@ INCLUDES = -I$(APPSDIR) -I.. -I. $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR)
CFLAGS = $(INCLUDES) $(GCCOPTS) -O2 $(TARGET) $(EXTRA_DEFINES) \ CFLAGS = $(INCLUDES) $(GCCOPTS) -O2 $(TARGET) $(EXTRA_DEFINES) \
-DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN
ifeq ($(UNAME), Darwin)
SHARED_FLAG=-dynamiclib -Wl,-single_module
else
SHARED_FLAG=-shared
endif
ifdef APPEXTRA ifdef APPEXTRA
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
endif endif

6
apps/plugins/pacbox/Makefile
View file

@ -12,12 +12,6 @@ INCLUDES = -I$(APPSDIR) -I.. -I. $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR)
CFLAGS = $(INCLUDES) $(GCCOPTS) -O2 $(TARGET) $(EXTRA_DEFINES) \ CFLAGS = $(INCLUDES) $(GCCOPTS) -O2 $(TARGET) $(EXTRA_DEFINES) \
-DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN
ifeq ($(UNAME), Darwin)
SHARED_FLAG=-dynamiclib -Wl,-single_module
else
SHARED_FLAG=-shared
endif
ifdef APPEXTRA ifdef APPEXTRA
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
endif endif

6
apps/plugins/rockboy/Makefile
View file

@ -16,12 +16,6 @@ ifdef APPEXTRA
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
endif endif
ifeq ($(UNAME), Darwin)
SHARED_FLAG=-dynamiclib -Wl,-single_module
else
SHARED_FLAG=-shared
endif
LINKFILE := $(OBJDIR)/link.lds LINKFILE := $(OBJDIR)/link.lds
DEPFILE = $(OBJDIR)/dep-rockboy DEPFILE = $(OBJDIR)/dep-rockboy
SRC = cpu.c emu.c events.c exports.c fastmem.c hw.c lcd.c lcdc.c loader.c \ SRC = cpu.c emu.c events.c exports.c fastmem.c hw.c lcd.c lcdc.c loader.c \

6
apps/plugins/searchengine/Makefile
View file

@ -16,12 +16,6 @@ ifdef APPEXTRA
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
endif endif
ifeq ($(UNAME), Darwin)
SHARED_FLAG=-dynamiclib -Wl,-single_module
else
SHARED_FLAG=-shared
endif
LINKFILE := $(OBJDIR)/link.lds LINKFILE := $(OBJDIR)/link.lds
DEPFILE = $(OBJDIR)/dep-searchengine DEPFILE = $(OBJDIR)/dep-searchengine
SRC = searchengine.c parser.c token.c dbinterface.c SRC = searchengine.c parser.c token.c dbinterface.c

6
apps/plugins/sudoku/Makefile
View file

@ -17,12 +17,6 @@ ifdef APPEXTRA
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
endif endif
ifeq ($(UNAME), Darwin)
SHARED_FLAG=-dynamiclib -Wl,-single_module
else
SHARED_FLAG=-shared
endif
LINKFILE := $(OBJDIR)/link.lds LINKFILE := $(OBJDIR)/link.lds
DEPFILE = $(OBJDIR)/dep-sudoku DEPFILE = $(OBJDIR)/dep-sudoku

6
apps/plugins/zxbox/Makefile
View file

@ -12,12 +12,6 @@ INCLUDES = -I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \
CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(EXTRA_DEFINES) \ CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(EXTRA_DEFINES) \
-DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN $(OPT_FLAGS) $(PROFILE_OPTS) -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 ifdef APPEXTRA
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
endif endif

6
tools/configure vendored
View file

@ -103,6 +103,7 @@ simcc () {
CYGWIN*) CYGWIN*)
echo "Cygwin host detected" echo "Cygwin host detected"
SHARED_FLAG="-shared"
if [ "$simver" = "win32" ]; then if [ "$simver" = "win32" ]; then
# win32 version # win32 version
GCCOPTS="$GCCOPTS -mno-cygwin -DNOCYGWIN" GCCOPTS="$GCCOPTS -mno-cygwin -DNOCYGWIN"
@ -124,6 +125,7 @@ simcc () {
Linux) Linux)
echo "Linux host detected" echo "Linux host detected"
GCCOPTS="$GCCOPTS" GCCOPTS="$GCCOPTS"
SHARED_FLAG="-shared"
if [ "$simver" = "win32" ]; then if [ "$simver" = "win32" ]; then
LDOPTS='-L/usr/X11R6/lib -lX11 -lm -lXt -lXmu -lnsl -ldl -lpthread' LDOPTS='-L/usr/X11R6/lib -lX11 -lm -lXt -lXmu -lnsl -ldl -lpthread'
crosswincc # setup cross-compiler crosswincc # setup cross-compiler
@ -144,6 +146,7 @@ simcc () {
FreeBSD) FreeBSD)
echo "FreeBSD host detected" echo "FreeBSD host detected"
LDOPTS='-L/usr/X11R6/lib -lX11 -lm -lXt -lXmu -dl -lpthread' LDOPTS='-L/usr/X11R6/lib -lX11 -lm -lXt -lXmu -dl -lpthread'
SHARED_FLAG="-shared"
if [ "$simver" = "win32" ]; then if [ "$simver" = "win32" ]; then
crosswincc # setup cross-compiler crosswincc # setup cross-compiler
fi fi
@ -154,6 +157,7 @@ simcc () {
# sdl version # sdl version
GCCOPTS="$GCCOPTS `sdl-config --cflags`" GCCOPTS="$GCCOPTS `sdl-config --cflags`"
LDOPTS="`sdl-config --libs`" LDOPTS="`sdl-config --libs`"
SHARED_FLAG="-dynamiclib -Wl\,-single_module"
use_simsound="#define ROCKBOX_HAS_SIMSOUND 1" use_simsound="#define ROCKBOX_HAS_SIMSOUND 1"
echo "Enabled PCM sound playback in simulator" echo "Enabled PCM sound playback in simulator"
;; ;;
@ -1359,6 +1363,7 @@ sed > Makefile \
-e "s,@PLUGINS@,${plugins},g" \ -e "s,@PLUGINS@,${plugins},g" \
-e "s,@CODECS@,${codecs},g" \ -e "s,@CODECS@,${codecs},g" \
-e "s,@PROFILE_OPTS@,${PROFILE_OPTS},g" \ -e "s,@PROFILE_OPTS@,${PROFILE_OPTS},g" \
-e "s,@SHARED_FLAG@,${SHARED_FLAG},g" \
-e "s,@GCCOPTS@,${GCCOPTS},g" \ -e "s,@GCCOPTS@,${GCCOPTS},g" \
-e "s,@TARGET_INC@,${TARGET_INC},g" \ -e "s,@TARGET_INC@,${TARGET_INC},g" \
-e "s!@LDOPTS@!${LDOPTS}!g" \ -e "s!@LDOPTS@!${LDOPTS}!g" \
@ -1429,6 +1434,7 @@ export TARGET_INC=@TARGET_INC@
export LOADADDRESS=@LOADADDRESS@ export LOADADDRESS=@LOADADDRESS@
export SIMVER=@SIMVER@ export SIMVER=@SIMVER@
export SIMDIR=\$(ROOTDIR)/uisimulator/\$(SIMVER) export SIMDIR=\$(ROOTDIR)/uisimulator/\$(SIMVER)
export SHARED_FLAG=@SHARED_FLAG@
export LDOPTS=@LDOPTS@ export LDOPTS=@LDOPTS@
export GCCVER=@GCCVER@ export GCCVER=@GCCVER@
export GCCNUM=@GCCNUM@ export GCCNUM=@GCCNUM@