mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-22 22:00:49 +00:00
Do not link against system libraries if not building DLLs on Windows
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13368 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
5dc06a92dd
commit
5ab684e698
1 changed files with 11 additions and 4 deletions
|
@ -50,14 +50,21 @@ include $(GNUSTEP_MAKEFILES)/Instance/Shared/headers.make
|
|||
bundle-resource-files \
|
||||
bundle-localized-resource-files
|
||||
|
||||
|
||||
# On Solaris we don't need to specifies the libraries the bundle needs.
|
||||
# How about the rest of the systems? BUNDLE_LIBS is temporary empty.
|
||||
# We need this for MS Windows, so use it again!
|
||||
ifeq ($(WITH_DLL),yes)
|
||||
# This is only for Windows ... on other systems, we don't need to link
|
||||
# the bundle against the system libraries, which are already linked in
|
||||
# the application ... linking them both in the bundle and in the
|
||||
# application would just make things more difficult when the bundle is
|
||||
# loaded (eg, if the application and the bundle end up being linked to
|
||||
# different versions of the system libraries ...)
|
||||
#
|
||||
# On the contrary, we need it on Windows (FIXME - add an explanation
|
||||
# of why we need it on Windows)
|
||||
BUNDLE_LIBS += $(ADDITIONAL_GUI_LIBS) $(AUXILIARY_GUI_LIBS) $(BACKEND_LIBS) \
|
||||
$(GUI_LIBS) $(ADDITIONAL_TOOL_LIBS) $(AUXILIARY_TOOL_LIBS) \
|
||||
$(FND_LIBS) $(ADDITIONAL_OBJC_LIBS) $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS) \
|
||||
$(SYSTEM_LIBS) $(TARGET_SYSTEM_LIBS)
|
||||
endif
|
||||
|
||||
ALL_BUNDLE_LIBS = \
|
||||
$(shell $(WHICH_LIB_SCRIPT) \
|
||||
|
|
Loading…
Reference in a new issue