diff options
author | Barry Wardell <rockbox@barrywardell.net> | 2006-09-29 16:15:11 +0000 |
---|---|---|
committer | Barry Wardell <rockbox@barrywardell.net> | 2006-09-29 16:15:11 +0000 |
commit | 64f949f2954db85968850f6e157e5c3b10df6b7d (patch) | |
tree | 14003f384ae848d98473494a74618609ddf04c5f /apps/plugins/doom | |
parent | b692fb11b3bb081f51a7bab7351ccbfc78df6617 (diff) | |
download | rockbox-64f949f2954db85968850f6e157e5c3b10df6b7d.tar.gz rockbox-64f949f2954db85968850f6e157e5c3b10df6b7d.zip |
Allow UI simulator to be build on OS (Slightly updated version of FS5767)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11094 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/doom')
-rw-r--r-- | apps/plugins/doom/Makefile | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/apps/plugins/doom/Makefile b/apps/plugins/doom/Makefile index b79f5be7b0..a94a26a544 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.4 2006/07/27 13:27:19 linus | 6 | # Revision 1.5 2006/09/29 16:15:08 barrywardell |
7 | # Allow UI simulator to be build on OS (Slightly updated version of FS5767) | ||
8 | # | ||
9 | # Revision 1.4 2006-07-27 13:27:19 linus | ||
7 | # Moved the X5 button driver to the target tree | 10 | # Moved the X5 button driver to the target tree |
8 | # | 11 | # |
9 | # Revision 1.3 2006-04-14 21:07:56 kkurbjun | 12 | # Revision 1.3 2006-04-14 21:07:56 kkurbjun |
@@ -23,6 +26,12 @@ CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ | |||
23 | -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN \ | 26 | -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN \ |
24 | -Wno-strict-prototypes -O2 $(PROFILE_OPTS) | 27 | -Wno-strict-prototypes -O2 $(PROFILE_OPTS) |
25 | 28 | ||
29 | ifeq ($(UNAME), Darwin) | ||
30 | SHARED_FLAG=-dynamiclib -Wl,-single_module | ||
31 | else | ||
32 | SHARED_FLAG=-shared | ||
33 | endif | ||
34 | |||
26 | ifdef APPEXTRA | 35 | ifdef APPEXTRA |
27 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) | 36 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) |
28 | endif | 37 | endif |
@@ -85,7 +94,7 @@ ifeq ($(SIMVER), x11) | |||
85 | 94 | ||
86 | $(OUTPUT): $(OBJS) | 95 | $(OUTPUT): $(OBJS) |
87 | @echo "LD $@" | 96 | @echo "LD $@" |
88 | @$(CC) $(CFLAGS) -shared $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | 97 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
89 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 98 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
90 | # 'x' must be kept or you'll have "Win32 error 5" | 99 | # 'x' must be kept or you'll have "Win32 error 5" |
91 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 100 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
@@ -101,7 +110,7 @@ ifeq ($(SIMVER), sdl) | |||
101 | 110 | ||
102 | $(OUTPUT): $(OBJS) | 111 | $(OUTPUT): $(OBJS) |
103 | @echo "LD $@" | 112 | @echo "LD $@" |
104 | @$(CC) $(CFLAGS) -shared $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | 113 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
105 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 114 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
106 | # 'x' must be kept or you'll have "Win32 error 5" | 115 | # 'x' must be kept or you'll have "Win32 error 5" |
107 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 116 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |