Răsfoiți Sursa

Reenabled examples, but they'll only work with SDL, so only in Linux.

Cameron Hart 14 ani în urmă
părinte
comite
62bfc5b049
3 a modificat fișierele cu 27 adăugiri și 22 ștergeri
  1. 1 1
      CMakeLists.txt
  2. 10 1
      Examples/C++/2DShapes/CMakeLists.txt
  3. 16 20
      Examples/C++/CMakeLists.txt

+ 1 - 1
CMakeLists.txt

@@ -10,7 +10,7 @@ ENDIF(NOT CMAKE_BUILD_TYPE)
 OPTION(POLYCODE_BUILD_SHARED "Build Polycode shared libraries" ON)
 OPTION(POLYCODE_BUILD_STATIC "Build Polycode static libraries" OFF)
 OPTION(POLYCODE_BUILD_BINDINGS "Build Polycode Lua bindings" ON)
-OPTION(POLYCODE_BUILD_EXAMPLES "Build Polycode examples" OFF)
+OPTION(POLYCODE_BUILD_EXAMPLES "Build Polycode examples" ON)
 OPTION(POLYCODE_BUILD_MODULES "Build Polycode modules" OFF)
 OPTION(POLYCODE_BUILD_TOOLS "Build Polycode tools" ON)
 

+ 10 - 1
Examples/C++/2DShapes/CMakeLists.txt

@@ -1,2 +1,11 @@
 INCLUDE_DIRECTORIES(.)
-ADD_EXECUTABLE(2DShapes ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
+
+IF(POLYCODE_BUILD_SHARED)
+    ADD_EXECUTABLE(2DShapes ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
+    TARGET_LINK_LIBRARIES(2DShapes PolyCore)
+ENDIF(POLYCODE_BUILD_SHARED)
+
+IF(POLYCODE_BUILD_STATIC)
+    ADD_EXECUTABLE(2DShapes_static ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
+    TARGET_LINK_LIBRARIES(2DShapes PolyCore_static)
+ENDIF(POLYCODE_BUILD_STATIC)

+ 16 - 20
Examples/C++/CMakeLists.txt

@@ -1,8 +1,5 @@
-IF(POLYCODE_BUILD_SHARED)
-    LINK_LIBRARIES(PolyCore)
-ELSEIF(POLYCODE_BUILD_STATIC)
+IF(POLYCODE_BUILD_STATIC)
     LINK_LIBRARIES(
-        PolyCore_static
         ${OPENGL_LIBRARIES}
         ${OPENAL_LIBRARY}
         ${PNG_LIBRARIES}
@@ -10,20 +7,19 @@ ELSEIF(POLYCODE_BUILD_STATIC)
         ${PHYSFS_LIBRARY}
         ${VORBISFILE_LIBRARY}
     )
+ENDIF(POLYCODE_BUILD_STATIC)
 
-    # using SDL
-    IF(SDL_FOUND)
-        LINK_LIBRARIES(${SDL_LIBRARY} ${SDLMAIN_LIBRARY})
-    ENDIF(SDL_FOUND)
-ENDIF(POLYCODE_BUILD_SHARED)
-
-ADD_SUBDIRECTORY(2DShapes)
-ADD_SUBDIRECTORY(2DTransforms)
-ADD_SUBDIRECTORY(3DAudio)
-ADD_SUBDIRECTORY(AdvancedLighting)
-ADD_SUBDIRECTORY(BasicImage)
-ADD_SUBDIRECTORY(BasicLighting)
-ADD_SUBDIRECTORY(BasicText)
-ADD_SUBDIRECTORY(ScreenSprites)
-ADD_SUBDIRECTORY(ScreenEntities)
-ADD_SUBDIRECTORY(SkeletalAnimation)
+# Only build if using SDL
+IF(SDL_FOUND)
+    LINK_LIBRARIES(${SDL_LIBRARY} ${SDLMAIN_LIBRARY})
+    ADD_SUBDIRECTORY(2DShapes)
+    ADD_SUBDIRECTORY(2DTransforms)
+    ADD_SUBDIRECTORY(3DAudio)
+    ADD_SUBDIRECTORY(AdvancedLighting)
+    ADD_SUBDIRECTORY(BasicImage)
+    ADD_SUBDIRECTORY(BasicLighting)
+    ADD_SUBDIRECTORY(BasicText)
+    ADD_SUBDIRECTORY(ScreenSprites)
+    ADD_SUBDIRECTORY(ScreenEntities)
+    ADD_SUBDIRECTORY(SkeletalAnimation)
+ENDIF(SDL_FOUND)