gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not set OBJC_RUNTIME; do not check OBJC_COMPILER; support new library-combo

Browse source 
apple-apple-apple


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@15386 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2002-12-30 16:31:36 +00:00
parent cb8839b356
commit 91f623806e
1 changed files with 35 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
library-combo.make
View file

@ -1,4 +1,4 @@
#
# -*-makefile-*-
# library-combo.make
#
# Determine which runtime, foundation and gui library to use.
@ -39,6 +39,10 @@ ifeq ($(the_library_combo), nx)
the_library_combo = nx-nx-nx
endif
ifeq ($(the_library_combo), apple)
the_library_combo = apple-apple-apple
endif
ifeq ($(the_library_combo), gnu)
the_library_combo = gnu-gnu-gnu
endif
@ -90,7 +94,6 @@ ifeq ($(OBJC_RUNTIME_LIB), gnu)
OBJC_LDFLAGS =
OBJC_LIB_DIR =
OBJC_LIBS = -lobjc
OBJC_RUNTIME = GNU
RUNTIME_FLAG = -fgnu-runtime
RUNTIME_DEFINE = -DGNU_RUNTIME=1
endif
@ -99,7 +102,6 @@ ifeq ($(OBJC_RUNTIME_LIB), gnugc)
OBJC_LDFLAGS =
OBJC_LIB_DIR =
OBJC_LIBS = -lobjc_gc -lgc
OBJC_RUNTIME = GNU
RUNTIME_FLAG = -fgnu-runtime
RUNTIME_DEFINE = -DGNU_RUNTIME=1 -DOBJC_WITH_GC=1
ifeq ($(debug),yes)
@ -108,21 +110,25 @@ ifeq ($(OBJC_RUNTIME_LIB), gnugc)
endif
ifeq ($(OBJC_RUNTIME_LIB), nx)
OBJC_RUNTIME = NeXT
ifneq ($(OBJC_COMPILER), NeXT)
RUNTIME_FLAG = -fnext-runtime
endif
RUNTIME_FLAG = -fnext-runtime
RUNTIME_DEFINE = -DNeXT_RUNTIME=1
ifeq ($(FOUNDATION_LIB),gnu)
ifeq ($(FOUNDATION_LIB), gnu)
OBJC_LIBS = -lobjc
endif
endif
ifeq ($(OBJC_RUNTIME_LIB), sun)
OBJC_RUNTIME = Sun
RUNTIME_DEFINE = -DSun_RUNTIME=1
endif
ifeq ($(OBJC_RUNTIME_LIB), apple)
RUNTIME_FLAG = -fnext-runtime
RUNTIME_DEFINE = -DNeXT_RUNTIME=1
ifeq ($(FOUNDATION_LIB), gnu)
OBJC_LIBS = -lobjc
endif
endif
FND_LDFLAGS =
FND_LIBS =
#
@ -139,7 +145,7 @@ endif
# Our own foundation will install a base.make file into
# $GNUSTEP_MAKEFILES/Additional/ to set the needed flags
#
ifeq ($(FOUNDATION_LIB),nx)
ifeq ($(FOUNDATION_LIB), nx)
# -framework Foundation is used both to find headers, and to link
INTERNAL_OBJCFLAGS += -framework Foundation
FND_LIBS = -framework Foundation
@ -152,6 +158,15 @@ ifeq ($(FOUNDATION_LIB), sun)
FND_DEFINE = -DSun_Foundation_LIBRARY=1
endif
ifeq ($(FOUNDATION_LIB), apple)
# -framework Foundation is used both to find headers, and to link
INTERNAL_OBJCFLAGS += -framework Foundation
FND_LIBS = -framework Foundation
FND_DEFINE = -DNeXT_Foundation_LIBRARY=1
LIBRARIES_DEPEND_UPON += -framework Foundation
BUNDLE_LIBS += -framework Foundation
endif
#
# FIXME - Ask Helge to move this inside his libFoundation, and have
# it installed as a $(GNUSTEP_MAKEFILES)/Additional/libFoundation.make
@ -184,7 +199,16 @@ GUI_LIBS =
# Third-party GUI libraries - our own sets its flags into
# $(GNUSTEP_MAKEFILES)/Additional/gui.make
#
ifeq ($(GUI_LIB),nx)
ifeq ($(GUI_LIB), nx)
GUI_DEFINE = -DNeXT_GUI_LIBRARY=1
# -framework AppKit is used both to find headers, and to find the library
INTERNAL_OBJCFLAGS += -framework AppKit
GUI_LIBS = -framework AppKit
LIBRARIES_DEPEND_UPON += -framework AppKit
BUNDLE_LIBS += -framework AppKit
endif
ifeq ($(GUI_LIB), apple)
GUI_DEFINE = -DNeXT_GUI_LIBRARY=1
# -framework AppKit is used both to find headers, and to find the library
INTERNAL_OBJCFLAGS += -framework AppKit
@ -197,7 +221,3 @@ SYSTEM_INCLUDES = $(CONFIG_SYSTEM_INCL)
SYSTEM_LDFLAGS =
SYSTEM_LIB_DIR =
SYSTEM_LIBS =
## Local variables:
## mode: makefile
## End: