Просмотр исходного кода

Mac fixes for static libraries. Polycode Player isn't compiling yet.

Cameron Hart 14 лет назад
Родитель
Сommit
f7953a1b66

+ 1 - 0
CMake/PolycodeIncludes.cmake

@@ -11,6 +11,7 @@ ELSE(MSVC)
 ENDIF(MSVC)
 
 FIND_PACKAGE(OpenGL REQUIRED)
+FIND_PACKAGE(ZLIB REQUIRED)
 FIND_PACKAGE(PNG REQUIRED)
 FIND_PACKAGE(PhysFS REQUIRED)
 FIND_PACKAGE(OpenAL REQUIRED)

+ 1 - 1
Core/Contents/CMakeLists.txt

@@ -198,7 +198,7 @@ IF(MSVC)
 ELSEIF(APPLE)
     SET(polycore_SRCS ${polycore_SRCS} "../Build/Mac OS X/PolycodeView.mm" Source/PolyCocoaCore.mm)
     SET(polycore_HDRS ${polycore_HDRS} "../Build/Mac OS X/PolycodeView.h" Include/PolyCocoaCore.h)
-    SET(EXTRA_LIBS "-framework Cocoa")
+#    SET(EXTRA_LIBS "-framework Cocoa")
 ELSE(MSVC)
     SET(polycore_SRCS ${polycore_SRCS} ../Build/Linux/PolycodeView.cpp Source/PolySDLCore.cpp)
     SET(polycore_HDRS ${polycore_HDRS} ../Build/Linux/PolycodeView.h Include/PolySDLCore.h)

+ 13 - 0
Modules/Contents/2DPhysics/CMakeLists.txt

@@ -21,6 +21,19 @@ SET(CMAKE_DEBUG_POSTFIX "_d")
 #IF(POLYCODE_BUILD_SHARED)
 ADD_LIBRARY(Polycode2DPhysics SHARED ${polycode2DPhysics_SRCS} ${polycode2DPhysics_HDRS})
 TARGET_LINK_LIBRARIES(Polycode2DPhysics ${BOX2D_LIBRARIES})
+IF(APPLE)
+    TARGET_LINK_LIBRARIES(
+        Polycode2DPhysics
+        Polycore
+        "-framework Cocoa"
+        ${OPENGL_LIBRARIES}
+        ${OPENAL_LIBRARY}
+        ${PNG_LIBRARIES}
+        ${FREETYPE_LIBRARIES}
+        ${PHYSFS_LIBRARY}
+        ${VORBISFILE_LIBRARY}
+    )
+ENDIF(APPLE)
 #ENDIF(POLYCODE_BUILD_SHARED)
 
 #IF(POLYCODE_BUILD_STATIC)

+ 13 - 0
Modules/Contents/3DPhysics/CMakeLists.txt

@@ -25,6 +25,19 @@ SET(CMAKE_DEBUG_POSTFIX "_d")
 #IF(POLYCODE_BUILD_SHARED)
 ADD_LIBRARY(Polycode3DPhysics SHARED ${polycode3DPhysics_SRCS} ${polycode3DPhysics_HDRS})
 TARGET_LINK_LIBRARIES(Polycode3DPhysics ${BULLET_LIBRARIES})
+IF(APPLE)
+    TARGET_LINK_LIBRARIES(
+        Polycode3DPhysics
+        Polycore
+        "-framework Cocoa"
+        ${OPENGL_LIBRARIES}
+        ${OPENAL_LIBRARY}
+        ${PNG_LIBRARIES}
+        ${FREETYPE_LIBRARIES}
+        ${PHYSFS_LIBRARY}
+        ${VORBISFILE_LIBRARY}
+    )
+ENDIF(APPLE)
 #ENDIF(POLYCODE_BUILD_SHARED)
 
 #IF(POLYCODE_BUILD_STATIC)

+ 20 - 2
Player/Contents/CMakeLists.txt

@@ -36,13 +36,18 @@ IF(MSVC)
     
 ELSEIF(APPLE)
     SET(polycodeplayer_SRCS 
-        Source/PolycodePlayer.cpp
+#        Source/PolycodePlayer.cpp
         Source/PolycodePlayer.mm
         Source/PolycodeCocoaPlayer.mm
+        "../Build/Mac OS X/main.m"
+        "../Build/Mac OS X/MyDocument.m"
+        "../Build/Mac OS X/PPlayerDocumentController.m"
     )
     SET(polycodeplayer_HDRS 
         Include/PolycodePlayer.h
         Include/PolycodeCocoaPlayer.h
+        "../Build/Mac OS X/MyDocument.h"
+        "../Build/Mac OS X/PPlayerDocumentController.h"
     )
     
     INCLUDE_DIRECTORIES(Include)
@@ -54,7 +59,20 @@ ELSEIF(APPLE)
 
 #    IF(POLYCODE_BUILD_STATIC)
     ADD_EXECUTABLE(PolycodePlayer MACOSX_BUNDLE ${polycodeplayer_SRCS} ${polycodeplayer_HDRS})
-    TARGET_LINK_LIBRARIES(PolycodePlayer Polycore PolycodeLua ${LUA_LIBRARY})
+    TARGET_LINK_LIBRARIES(PolycodePlayer 
+        Polycore 
+        PolycodeLua 
+        "-framework Cocoa"
+        ${LUA_LIBRARY}
+        ${OPENGL_LIBRARIES}
+        ${OPENAL_LIBRARY}
+        ${PNG_LIBRARIES}
+        ${FREETYPE_LIBRARIES}
+        ${PHYSFS_LIBRARY}
+        ${OGG_LIBRARY}
+        ${VORBIS_LIBRARY}
+        ${VORBISFILE_LIBRARY}
+     )
 #    ENDIF(POLYCODE_BUILD_STATIC)
 
 ENDIF(MSVC)

+ 1 - 1
Tools/Contents/polybuild/CMakeLists.txt

@@ -20,7 +20,7 @@ SET(minizip_SRCS
 
 #IF(POLYCODE_BUILD_STATIC)
 ADD_EXECUTABLE(polybuild ${minizip_SRCS} Source/polybuild.cpp Include/polybuild.h)
-TARGET_LINK_LIBRARIES(polybuild Polycore ${PHYSFS_LIBRARY})
+TARGET_LINK_LIBRARIES(polybuild Polycore ${PHYSFS_LIBRARY} ${ZLIB_LIBRARIES})
 #ENDIF(POLYCODE_BUILD_STATIC)
 
 IF(POLYCODE_INSTALL_FRAMEWORK)