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/codecs | |
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/codecs')
-rw-r--r-- | apps/codecs/Makefile | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/apps/codecs/Makefile b/apps/codecs/Makefile index 62312e2288..28fc82ba79 100644 --- a/apps/codecs/Makefile +++ b/apps/codecs/Makefile | |||
@@ -12,6 +12,12 @@ INCLUDES = -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I$(FIRMDIR)/common \ | |||
12 | CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET_INC) $(TARGET) $(EXTRA_DEFINES) \ | 12 | CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET_INC) $(TARGET) $(EXTRA_DEFINES) \ |
13 | -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DCODEC | 13 | -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DCODEC |
14 | 14 | ||
15 | ifeq ($(UNAME), Darwin) | ||
16 | SHARED_FLAG=-dynamiclib -Wl,-single_module | ||
17 | else | ||
18 | SHARED_FLAG=-shared | ||
19 | endif | ||
20 | |||
15 | ifdef APPEXTRA | 21 | ifdef APPEXTRA |
16 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) | 22 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) |
17 | endif | 23 | endif |
@@ -80,7 +86,7 @@ ifeq ($(SIMVER), x11) | |||
80 | 86 | ||
81 | $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a $(OUTPUT) | 87 | $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a $(OUTPUT) |
82 | @echo "LD $(notdir $@)" | 88 | @echo "LD $(notdir $@)" |
83 | $(SILENT)$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@ | 89 | $(SILENT)$(CC) $(CFLAGS) $(SHARED_FLAG) $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@ |
84 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 90 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
85 | # 'x' must be kept or you'll have "Win32 error 5" | 91 | # 'x' must be kept or you'll have "Win32 error 5" |
86 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 92 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
@@ -96,7 +102,7 @@ ifeq ($(SIMVER), sdl) | |||
96 | 102 | ||
97 | $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a $(OUTPUT) | 103 | $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a $(OUTPUT) |
98 | @echo "LD $(notdir $@) $^" | 104 | @echo "LD $(notdir $@) $^" |
99 | $(SILENT)$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@ | 105 | $(SILENT)$(CC) $(CFLAGS) $(SHARED_FLAG) $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@ |
100 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 106 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
101 | # 'x' must be kept or you'll have "Win32 error 5" | 107 | # 'x' must be kept or you'll have "Win32 error 5" |
102 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 108 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |