Mac OS X|qmake: Compiling on Mountain Lion

The "deng_nativesdk" option can now be used to compile on everything on Mountain Lion.
skyjake · Jul 26, 2012 · a12ccb8 · a12ccb8
1 parent d09e4c9
commit a12ccb8
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 1 deletion.
diff --git a/doomsday/config_macx.pri b/doomsday/config_macx.pri
@@ -36,6 +36,13 @@ QMAKE_LFLAGS += -flat_namespace -undefined suppress
 
 deng_nativesdk {
     echo(Using native SDK.)
+    #QMAKE_MAC_SDK = $$(SDKROOT)
+    #isEmpty(QMAKE_MAC_SDK) {
+    #    error(Set the SDKROOT environment variable to specify which Mac OS X SDK to use.)
+    #}
+    DEFINES += MACOSX_NATIVESDK
+    #QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
+    #QMAKE_CFLAGS += -mmacosx-version-min=10.8
 }
 else:deng_macx7_64bit {
     echo(Using Mac OS 10.7 SDK.)

diff --git a/doomsday/config_unix_any.pri b/doomsday/config_unix_any.pri
@@ -17,6 +17,7 @@ QMAKE_CFLAGS_WARN_ON += -Werror-implicit-function-declaration -fdiagnostics-show
 
 # Print include directories and other info.
 #QMAKE_CFLAGS += -Wp,-v
+#QMAKE_LFLAGS += -v
 
 # Unix System Tools ----------------------------------------------------------
 

diff --git a/doomsday/engine/portable/include/sys_opengl.h b/doomsday/engine/portable/include/sys_opengl.h
@@ -45,7 +45,13 @@
 
 #ifdef UNIX
 #  define GL_GLEXT_PROTOTYPES
-#  ifdef MACOSX
+#  ifdef MACOSX_NATIVESDK
+#    define GL_EXT_compiled_vertex_array 1
+#    include <OpenGL/gl.h>
+#    include <OpenGL/glu.h>
+#    include <OpenGL/glext.h>
+#    include <OpenGL/OpenGL.h>
+#  elif defined(MACOSX)
 #    include <GL/gl.h>
 #    include <GL/glu.h>
 #    include <OpenGL/OpenGL.h>
@@ -58,6 +64,15 @@
 #  define GL_CALL
 #endif
 
+#ifndef GL_NV_texture_env_combine4
+#  define GL_NV_texture_env_combine4    1
+#  define GL_COMBINE4_NV                0x8503
+#  define GL_SOURCE3_RGB_NV             0x8583
+#  define GL_SOURCE3_ALPHA_NV           0x858B
+#  define GL_OPERAND3_RGB_NV            0x8593
+#  define GL_OPERAND3_ALPHA_NV          0x859B
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/doomsday/libdeng/libdeng.pro b/doomsday/libdeng/libdeng.pro
@@ -90,6 +90,7 @@ macx {
         doPostLink("install_name_tool -change $$(QTDIR)lib/$$1 @executable_path/../Frameworks/$$1 libdeng1.1.dylib")
         doPostLink("install_name_tool -change $$(QTDIR)/lib/$$1 @executable_path/../Frameworks/$$1 libdeng1.1.dylib")
     }
+    doPostLink("install_name_tool -id @executable_path/../Frameworks/libdeng1.1.dylib libdeng1.1.dylib")
     fixDengLinkage("QtCore.framework/Versions/4/QtCore")
     fixDengLinkage("QtNetwork.framework/Versions/4/QtNetwork")
     fixDengLinkage("QtGui.framework/Versions/4/QtGui")

diff --git a/doomsday/libdeng2/libdeng2.pro b/doomsday/libdeng2/libdeng2.pro
@@ -74,6 +74,7 @@ macx {
         doPostLink("install_name_tool -change $$(QTDIR)lib/$$1 @executable_path/../Frameworks/$$1 libdeng2.2.dylib")
         doPostLink("install_name_tool -change $$(QTDIR)/lib/$$1 @executable_path/../Frameworks/$$1 libdeng2.2.dylib")
     }
+    doPostLink("install_name_tool -id @executable_path/../Frameworks/libdeng2.2.dylib libdeng2.2.dylib")
     fixInstallName("QtCore.framework/Versions/4/QtCore")
     fixInstallName("QtNetwork.framework/Versions/4/QtNetwork")
     fixInstallName("QtGui.framework/Versions/4/QtGui")