OS X compile: do not build the AGL target by default (use make cl-release to build...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11233 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/BSDmakefile b/BSDmakefile
index 28106df6c7cff170c0cdc214c122e366a01ffdee..ac9793a06a0f6db3a0c065836add4438f2922ff4 100644 (file)
--- a/BSDmakefile
+++ b/BSDmakefile
@@ -10,6 +10,14 @@ DP_ARCH != uname
 # Command used to delete files
 CMD_RM=$(CMD_UNIXRM)
 
+# default targets
+TARGETS_DEBUG=sv-debug cl-debug sdl-debug
+TARGETS_PROFILE=sv-profile cl-profile sdl-profile
+TARGETS_RELEASE=sv-release cl-release sdl-release
+TARGETS_RELEASE_PROFILE=sv-release-profile cl-release-profile sdl-release-profile
+TARGETS_NEXUIZ=sv-nexuiz cl-nexuiz sdl-nexuiz
+
+# X11 libs
 UNIX_X11LIBPATH=/usr/X11R6/lib
 
 # BSD configuration

diff --git a/makefile b/makefile
index 7d3f73a3f29b043860cfe1df3b861504acfde199..84db7512929f70e67687b17d5bb9840f6fe0247b 100644 (file)
--- a/makefile
+++ b/makefile
@@ -47,6 +47,12 @@ else
        UNIX_X11LIBPATH:=/usr/X11R6/lib
 endif
 
+# default targets
+TARGETS_DEBUG=sv-debug cl-debug sdl-debug
+TARGETS_PROFILE=sv-profile cl-profile sdl-profile
+TARGETS_RELEASE=sv-release cl-release sdl-release
+TARGETS_RELEASE_PROFILE=sv-release-profile cl-release-profile sdl-release-profile
+TARGETS_NEXUIZ=sv-nexuiz cl-nexuiz sdl-nexuiz
 
 # Linux configuration
 ifeq ($(DP_MAKE_TARGET), linux)
@@ -109,6 +115,14 @@ ifeq ($(DP_MAKE_TARGET), macosx)
        # we don't currently link to libjpeg on Mac because the OS does not have an easy way to load libjpeg and we provide our own in the .app
        CFLAGS_LIBJPEG=
        LIB_JPEG=
+
+       # on OS X, we don't build the CL by default because it uses deprecated
+       # and not-implemented-in-64bit Carbon
+       TARGETS_DEBUG=sv-debug sdl-debug
+       TARGETS_PROFILE=sv-profile sdl-profile
+       TARGETS_RELEASE=sv-release sdl-release
+       TARGETS_RELEASE_PROFILE=sv-release-profile sdl-release-profile
+       TARGETS_NEXUIZ=sv-nexuiz sdl-nexuiz
 endif
 
 # SunOS configuration (Solaris)

diff --git a/makefile.inc b/makefile.inc
index 176e384ec57e9cf60bcfc518574c50a4e8de2df4..dd55442a6b02be277ce1d47d08d83582accc6bdb 100644 (file)
--- a/makefile.inc
+++ b/makefile.inc
@@ -358,19 +358,19 @@ help:
        @echo
 
 debug :
-       $(MAKE) sv-debug cl-debug sdl-debug
+       $(MAKE) $(TARGETS_DEBUG)
 
 profile :
-       $(MAKE) sv-profile cl-profile sdl-profile
+       $(MAKE) $(TARGETS_PROFILE)
 
 release :
-       $(MAKE) sv-release cl-release sdl-release
+       $(MAKE) $(TARGETS_RELEASE)
 
 release-profile :
-       $(MAKE) sv-release-profile cl-release-profile sdl-release-profile
+       $(MAKE) $(TARGETS_RELEASE_PROFILE)
 
 nexuiz :
-       $(MAKE) sv-nexuiz cl-nexuiz sdl-nexuiz
+       $(MAKE) $(TARGETS_NEXUIZ)
 
 cl-debug :
        $(MAKE) bin-debug \