summaryrefslogtreecommitdiff
path: root/apps/plugins
diff options
context:
space:
mode:
authorBarry Wardell <rockbox@barrywardell.net>2006-09-29 20:04:36 +0000
committerBarry Wardell <rockbox@barrywardell.net>2006-09-29 20:04:36 +0000
commitce74dc074355dcf8db9bd0c09ee2624089d3c3e7 (patch)
tree423ac7b5e98b4d7754e48b950160f638471c4ac8 /apps/plugins
parent64f949f2954db85968850f6e157e5c3b10df6b7d (diff)
downloadrockbox-ce74dc074355dcf8db9bd0c09ee2624089d3c3e7.tar.gz
rockbox-ce74dc074355dcf8db9bd0c09ee2624089d3c3e7.zip
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
Diffstat (limited to 'apps/plugins')
-rw-r--r--apps/plugins/Makefile6
-rw-r--r--apps/plugins/chessbox/Makefile6
-rw-r--r--apps/plugins/databox/Makefile6
-rw-r--r--apps/plugins/doom/Makefile11
-rw-r--r--apps/plugins/mpegplayer/Makefile6
-rw-r--r--apps/plugins/pacbox/Makefile6
-rw-r--r--apps/plugins/rockboy/Makefile6
-rw-r--r--apps/plugins/searchengine/Makefile6
-rw-r--r--apps/plugins/sudoku/Makefile6
-rw-r--r--apps/plugins/zxbox/Makefile6
10 files changed, 4 insertions, 61 deletions
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
13CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(EXTRA_DEFINES) \ 13CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(EXTRA_DEFINES) \
14 -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN 14 -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN
15 15
16ifeq ($(UNAME), Darwin)
17SHARED_FLAG=-dynamiclib -Wl,-single_module
18else
19SHARED_FLAG=-shared
20endif
21
22ifdef APPEXTRA 16ifdef APPEXTRA
23 INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) 17 INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
24endif 18endif
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)
12CFLAGS = $(GCCOPTS) -O2 $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ 12CFLAGS = $(GCCOPTS) -O2 $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
13 -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN 13 -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN
14 14
15ifeq ($(UNAME), Darwin)
16SHARED_FLAG=-dynamiclib -Wl,-single_module
17else
18SHARED_FLAG=-shared
19endif
20
21ifdef APPEXTRA 15ifdef APPEXTRA
22 INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) 16 INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
23endif 17endif
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)
12CFLAGS = $(INCLUDES) $(GCCOPTS) -O3 $(TARGET) $(EXTRA_DEFINES) \ 12CFLAGS = $(INCLUDES) $(GCCOPTS) -O3 $(TARGET) $(EXTRA_DEFINES) \
13 -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN 13 -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN
14 14
15ifeq ($(UNAME), Darwin)
16SHARED_FLAG=-dynamiclib -Wl,-single_module
17else
18SHARED_FLAG=-shared
19endif
20
21ifdef APPEXTRA 15ifdef APPEXTRA
22 INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) 16 INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
23endif 17endif
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 @@
3# $Id$ 3# $Id$
4# 4#
5# $Log$ 5# $Log$
6# Revision 1.5 2006/09/29 16:15:08 barrywardell 6# Revision 1.6 2006/09/29 20:04:35 barrywardell
7# 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.
8#
9# Revision 1.5 2006-09-29 16:15:08 barrywardell
7# Allow UI simulator to be build on OS (Slightly updated version of FS5767) 10# Allow UI simulator to be build on OS (Slightly updated version of FS5767)
8# 11#
9# Revision 1.4 2006-07-27 13:27:19 linus 12# Revision 1.4 2006-07-27 13:27:19 linus
@@ -26,12 +29,6 @@ CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
26 -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN \ 29 -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN \
27 -Wno-strict-prototypes -O2 $(PROFILE_OPTS) 30 -Wno-strict-prototypes -O2 $(PROFILE_OPTS)
28 31
29ifeq ($(UNAME), Darwin)
30SHARED_FLAG=-dynamiclib -Wl,-single_module
31else
32SHARED_FLAG=-shared
33endif
34
35ifdef APPEXTRA 32ifdef APPEXTRA
36 INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) 33 INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
37endif 34endif
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)
12CFLAGS = $(INCLUDES) $(GCCOPTS) -O2 $(TARGET) $(EXTRA_DEFINES) \ 12CFLAGS = $(INCLUDES) $(GCCOPTS) -O2 $(TARGET) $(EXTRA_DEFINES) \
13 -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN 13 -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN
14 14
15ifeq ($(UNAME), Darwin)
16SHARED_FLAG=-dynamiclib -Wl,-single_module
17else
18SHARED_FLAG=-shared
19endif
20
21ifdef APPEXTRA 15ifdef APPEXTRA
22 INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) 16 INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
23endif 17endif
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)
12CFLAGS = $(INCLUDES) $(GCCOPTS) -O2 $(TARGET) $(EXTRA_DEFINES) \ 12CFLAGS = $(INCLUDES) $(GCCOPTS) -O2 $(TARGET) $(EXTRA_DEFINES) \
13 -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN 13 -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN
14 14
15ifeq ($(UNAME), Darwin)
16SHARED_FLAG=-dynamiclib -Wl,-single_module
17else
18SHARED_FLAG=-shared
19endif
20
21ifdef APPEXTRA 15ifdef APPEXTRA
22 INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) 16 INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
23endif 17endif
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
16 INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) 16 INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
17endif 17endif
18 18
19ifeq ($(UNAME), Darwin)
20SHARED_FLAG=-dynamiclib -Wl,-single_module
21else
22SHARED_FLAG=-shared
23endif
24
25LINKFILE := $(OBJDIR)/link.lds 19LINKFILE := $(OBJDIR)/link.lds
26DEPFILE = $(OBJDIR)/dep-rockboy 20DEPFILE = $(OBJDIR)/dep-rockboy
27SRC = cpu.c emu.c events.c exports.c fastmem.c hw.c lcd.c lcdc.c loader.c \ 21SRC = 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
16 INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) 16 INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
17endif 17endif
18 18
19ifeq ($(UNAME), Darwin)
20SHARED_FLAG=-dynamiclib -Wl,-single_module
21else
22SHARED_FLAG=-shared
23endif
24
25LINKFILE := $(OBJDIR)/link.lds 19LINKFILE := $(OBJDIR)/link.lds
26DEPFILE = $(OBJDIR)/dep-searchengine 20DEPFILE = $(OBJDIR)/dep-searchengine
27SRC = searchengine.c parser.c token.c dbinterface.c 21SRC = 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
17 INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) 17 INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
18endif 18endif
19 19
20ifeq ($(UNAME), Darwin)
21SHARED_FLAG=-dynamiclib -Wl,-single_module
22else
23SHARED_FLAG=-shared
24endif
25
26LINKFILE := $(OBJDIR)/link.lds 20LINKFILE := $(OBJDIR)/link.lds
27DEPFILE = $(OBJDIR)/dep-sudoku 21DEPFILE = $(OBJDIR)/dep-sudoku
28 22
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 \
12CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(EXTRA_DEFINES) \ 12CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(EXTRA_DEFINES) \
13 -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN $(OPT_FLAGS) $(PROFILE_OPTS) 13 -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN $(OPT_FLAGS) $(PROFILE_OPTS)
14 14
15ifeq ($(UNAME), Darwin)
16SHARED_FLAG=-dynamiclib -Wl,-single_module
17else
18SHARED_FLAG=-shared
19endif
20
21ifdef APPEXTRA 15ifdef APPEXTRA
22 INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) 16 INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
23endif 17endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-19 22:51:24 +0000