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

Got all examples working on Linux with CMake.

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

+ 0 - 4
CMakeLists.txt

@@ -14,9 +14,5 @@ IF(MSVC)
 	ENDIF(USE_MSVC_FAST_FLOATINGPOINT)
 ENDIF(MSVC)
 
-IF(WIN32)
-	ADD_DEFINITIONS(/D _CRT_SECURE_NO_WARNINGS)
-ENDIF(WIN32)
-
 ADD_SUBDIRECTORY(Core/Contents)
 ADD_SUBDIRECTORY(Examples/C++)

+ 2 - 18
Examples/C++/2DShapes/CMakeLists.txt

@@ -1,18 +1,2 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-
-FIND_PACKAGE(OpenGL REQUIRED)
-FIND_PACKAGE(Freetype REQUIRED)
-FIND_PACKAGE(PNG REQUIRED)
-
-ADD_DEFINITIONS(-DGL_GLEXT_PROTOTYPES ${PNG_DEFINITIONS})
-
-INCLUDE_DIRECTORIES(
-	${OPENGL_INCLUDE_DIR}
-	${FREETYPE_INCLUDE_DIRS}
-        ${PolyCode_SOURCE_DIR}/Core/Contents/Include
-)
-
-LINK_LIBRARIES(PolyCoreStatic)
-
-ADD_EXECUTABLE(2DShapes HelloPolycodeApp.cpp HelloPolycodeApp.h)
-
+INCLUDE_DIRECTORIES(.)
+ADD_EXECUTABLE(2DShapes ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)

+ 2 - 0
Examples/C++/2DTransforms/CMakeLists.txt

@@ -0,0 +1,2 @@
+INCLUDE_DIRECTORIES(.)
+ADD_EXECUTABLE(2DTransforms ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)

+ 2 - 0
Examples/C++/3DAudio/CMakeLists.txt

@@ -0,0 +1,2 @@
+INCLUDE_DIRECTORIES(.)
+ADD_EXECUTABLE(3DAudio ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)

+ 2 - 0
Examples/C++/AdvancedLighting/CMakeLists.txt

@@ -0,0 +1,2 @@
+INCLUDE_DIRECTORIES(.)
+ADD_EXECUTABLE(AdvancedLighting ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)

+ 2 - 5
Examples/C++/BasicImage/CMakeLists.txt

@@ -1,5 +1,2 @@
-ADD_EXECUTABLE(BasicImage main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-
-
-
-
+INCLUDE_DIRECTORIES(.)
+ADD_EXECUTABLE(BasicImage ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)

+ 0 - 10
Examples/C++/BasicImage/main.cpp

@@ -1,10 +0,0 @@
-#include "Polycode.h"
-#include "PolycodeView.h"
-#include "HelloPolycodeApp.h"
-
-int main(int argc, char *argv[]) {
-	PolycodeView *view = new PolycodeView("Hello Polycode!");
-	HelloPolycodeApp *app = new HelloPolycodeApp(view);
-	while(app->Update()) {}
-	return 0;
-}

+ 2 - 1
Examples/C++/BasicLighting/CMakeLists.txt

@@ -1 +1,2 @@
-ADD_EXECUTABLE(BasicLighting main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
+INCLUDE_DIRECTORIES(.)
+ADD_EXECUTABLE(BasicLighting ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)

+ 0 - 10
Examples/C++/BasicLighting/main.cpp

@@ -1,10 +0,0 @@
-#include "Polycode.h"
-#include "PolycodeView.h"
-#include "HelloPolycodeApp.h"
-
-int main(int argc, char *argv[]) {
-	PolycodeView *view = new PolycodeView("Hello Polycode!");
-	HelloPolycodeApp *app = new HelloPolycodeApp(view);
-	while(app->Update()) {}
-	return 0;
-}

+ 2 - 5
Examples/C++/BasicText/CMakeLists.txt

@@ -1,5 +1,2 @@
-ADD_EXECUTABLE(BasicText main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-
-
-
-
+INCLUDE_DIRECTORIES(.)
+ADD_EXECUTABLE(BasicText ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)

+ 0 - 10
Examples/C++/BasicText/main.cpp

@@ -1,10 +0,0 @@
-#include "Polycode.h"
-#include "PolycodeView.h"
-#include "HelloPolycodeApp.h"
-
-int main(int argc, char *argv[]) {
-	PolycodeView *view = new PolycodeView("Hello Polycode!");
-	HelloPolycodeApp *app = new HelloPolycodeApp(view);
-	while(app->Update()) {}
-	return 0;
-}

+ 4 - 2
Examples/C++/CMakeLists.txt

@@ -6,6 +6,8 @@ FIND_PACKAGE(Freetype REQUIRED)
 FIND_PACKAGE(PNG REQUIRED)
 FIND_PACKAGE(SDL REQUIRED)
 
+FIND_LIBRARY(VORBISFILE_LIBRARY NAMES vorbisfile)
+
 ADD_DEFINITIONS(-DGL_GLEXT_PROTOTYPES ${PNG_DEFINITIONS})
 
 INCLUDE_DIRECTORIES(
@@ -24,16 +26,16 @@ LINK_LIBRARIES(
     ${PNG_LIBRARIES}
     ${FREETYPE_LIBRARIES}
     ${PHYSFS_LIBRARY}
+    ${VORBISFILE_LIBRARY}
 )
 
-#ADD_SUBDIRECTORY(2DShapes)
+ADD_SUBDIRECTORY(2DShapes)
 ADD_SUBDIRECTORY(2DTransforms)
 ADD_SUBDIRECTORY(3DAudio)
 ADD_SUBDIRECTORY(AdvancedLighting)
 ADD_SUBDIRECTORY(BasicImage)
 ADD_SUBDIRECTORY(BasicLighting)
 ADD_SUBDIRECTORY(BasicText)
-ADD_SUBDIRECTORY(Resources)
 ADD_SUBDIRECTORY(ScreenSprites)
 ADD_SUBDIRECTORY(ScreenEntities)
 ADD_SUBDIRECTORY(SkeletalAnimation)

+ 0 - 0
Examples/C++/Resources/CMakeLists.txt


+ 2 - 0
Examples/C++/ScreenEntities/CMakeLists.txt

@@ -0,0 +1,2 @@
+INCLUDE_DIRECTORIES(.)
+ADD_EXECUTABLE(ScreenEntities ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)

+ 2 - 0
Examples/C++/ScreenSprites/CMakeLists.txt

@@ -0,0 +1,2 @@
+INCLUDE_DIRECTORIES(.)
+ADD_EXECUTABLE(ScreenSprites ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)

+ 2 - 0
Examples/C++/SkeletalAnimation/CMakeLists.txt

@@ -0,0 +1,2 @@
+INCLUDE_DIRECTORIES(.)
+ADD_EXECUTABLE(SkeletalAnimation ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)