diff options
author | Nils Wallménius <nils@rockbox.org> | 2011-06-07 11:56:23 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2011-06-07 11:56:23 +0000 |
commit | 331b23d15b765489a9abd344ddab9771125c3754 (patch) | |
tree | 39b809790113945740bec94cfbe27eb4113ef498 /apps | |
parent | f9f96325e20be46d1cf12492818485f2f84c3c3a (diff) | |
download | rockbox-331b23d15b765489a9abd344ddab9771125c3754.tar.gz rockbox-331b23d15b765489a9abd344ddab9771125c3754.zip |
FS#12144, Use -fPIC -fvisibility=hidden only for plugins on sim and app builds and enable it for 32 bit too. Fixes linking errors on simbuilds.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29983 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/codecs/codecs.make | 3 | ||||
-rw-r--r-- | apps/plugins/doom/SOURCES | 1 | ||||
-rw-r--r-- | apps/plugins/doom/doom.make | 1 | ||||
-rw-r--r-- | apps/plugins/lua/Makefile | 2 | ||||
-rw-r--r-- | apps/plugins/plugins.make | 3 | ||||
-rw-r--r-- | apps/plugins/rockboy/SOURCES | 1 | ||||
-rw-r--r-- | apps/plugins/rockboy/rockboy.make | 1 |
7 files changed, 7 insertions, 5 deletions
diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make index be1a0e0f00..1a5dd8f36a 100644 --- a/apps/codecs/codecs.make +++ b/apps/codecs/codecs.make @@ -112,7 +112,8 @@ $(CODECDIR)/%.o: $(ROOTDIR)/apps/codecs/%.S -I$(dir $<) $(CODECFLAGS) $(ASMFLAGS) -c $< -o $@ ifdef APP_TYPE - CODECLDFLAGS = $(SHARED_FLAG) # <-- from Makefile + CODECLDFLAGS = $(SHARED_LDFLAG) # <-- from Makefile + CODECFLAGS += $(SHARED_CFLAGS) # <-- from Makefile else CODECLDFLAGS = -T$(CODECLINK_LDS) -Wl,--gc-sections -Wl,-Map,$(CODECDIR)/$*.map CODECFLAGS += -UDEBUG -DNDEBUG diff --git a/apps/plugins/doom/SOURCES b/apps/plugins/doom/SOURCES index 6cd69faee6..470cbf159c 100644 --- a/apps/plugins/doom/SOURCES +++ b/apps/plugins/doom/SOURCES @@ -1,3 +1,4 @@ +../../../firmware/libc/sscanf.c info.c doomdef.c doomstat.c diff --git a/apps/plugins/doom/doom.make b/apps/plugins/doom/doom.make index 58a4708819..07b553c454 100644 --- a/apps/plugins/doom/doom.make +++ b/apps/plugins/doom/doom.make @@ -13,7 +13,6 @@ DOOMBUILDDIR := $(BUILDDIR)/apps/plugins/doom ROCKS += $(DOOMBUILDDIR)/doom.rock DOOM_SRC := $(call preprocess, $(DOOMSRCDIR)/SOURCES) -DOOM_SRC += $(ROOTDIR)/firmware/libc/sscanf.c DOOM_OBJ := $(call c2obj, $(DOOM_SRC)) # add source files to OTHER_SRC to get automatic dependencies diff --git a/apps/plugins/lua/Makefile b/apps/plugins/lua/Makefile index 09535ac530..8568d79c4c 100644 --- a/apps/plugins/lua/Makefile +++ b/apps/plugins/lua/Makefile @@ -55,7 +55,7 @@ ifdef APP_TYPE # This is the SDL simulator version $(OUTPUT): $(OBJS) - $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ + $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_LDFLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) # 'x' must be kept or you'll have "Win32 error 5" # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make index 3271c57303..0c667aaf24 100644 --- a/apps/plugins/plugins.make +++ b/apps/plugins/plugins.make @@ -98,7 +98,8 @@ $(BUILDDIR)/apps/plugins/%.o: $(ROOTDIR)/apps/plugins/%.c $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PLUGINFLAGS) -c $< -o $@ ifdef APP_TYPE - PLUGINLDFLAGS = $(SHARED_FLAG) # <-- from Makefile + PLUGINLDFLAGS = $(SHARED_LDFLAG) # <-- from Makefile + PLUGINFLAGS += $(SHARED_CFLAGS) # <-- from Makefile else PLUGINLDFLAGS = -T$(PLUGINLINK_LDS) -Wl,--gc-sections -Wl,-Map,$*.map OVERLAYLDFLAGS = -T$(OVERLAYREF_LDS) -Wl,--gc-sections -Wl,-Map,$*.refmap diff --git a/apps/plugins/rockboy/SOURCES b/apps/plugins/rockboy/SOURCES index 8806b58389..b289db203e 100644 --- a/apps/plugins/rockboy/SOURCES +++ b/apps/plugins/rockboy/SOURCES @@ -1,3 +1,4 @@ +../../../firmware/libc/sscanf.c cpu.c emu.c events.c diff --git a/apps/plugins/rockboy/rockboy.make b/apps/plugins/rockboy/rockboy.make index d7ae68c0c4..4869cedcbf 100644 --- a/apps/plugins/rockboy/rockboy.make +++ b/apps/plugins/rockboy/rockboy.make @@ -11,7 +11,6 @@ ROCKBOY_SRCDIR = $(APPSDIR)/plugins/rockboy ROCKBOY_OBJDIR = $(BUILDDIR)/apps/plugins/rockboy ROCKBOY_SRC := $(call preprocess, $(ROCKBOY_SRCDIR)/SOURCES) -ROCKBOY_SRC += $(ROOTDIR)/firmware/libc/sscanf.c ROCKBOY_OBJ := $(call c2obj, $(ROCKBOY_SRC)) OTHER_SRC += $(ROCKBOY_SRC) |