Fix build system

CMakeLists.txt

@@ -3,10 +3,10 @@ cmake_minimum_required(VERSION 2.8)
 project(crown)
 
 option (CROWN_USE_FLOAT "Whether to use float or double for representing real numbers." ON)
-option (CROWN_BUILD_OPENGL "Whether to build the OpenGL renderer or not." OFF)
+option (CROWN_BUILD_OPENGL "Whether to build the OpenGL renderer or not." ON)
 option (CROWN_BUILD_OPENGLES "Whether to build the OpenGL|ES 1.0 renderer or not." ON)
-option (CROWN_BUILD_SAMPLES "Whether to build the samples" OFF)
-option (CROWN_BUILD_TOOLS "Whether to build the tools" OFF)
+option (CROWN_BUILD_SAMPLES "Whether to build the samples" ON)
+option (CROWN_BUILD_TOOLS "Whether to build the tools" ON)
 option (CROWN_BUILD_TESTS "Whether to build unit tests" OFF)
 
 set (INCLUDES
@@ -31,48 +31,39 @@ set (INCLUDES
 include_directories(${INCLUDES})
 add_definitions(-pipe -ansi -W -Wall -Wextra -Wno-long-long -pedantic -fPIC -g -pg)
 
+# detect operating system
+if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+	set(LINUX 1)
+	add_subdirectory(src/os/linux)
+endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+	set (WINDOWS 1)
+	add_subdirectory(src/os/win)
+endif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+
 # add build directories
 add_subdirectory(src)
 
 if (CROWN_BUILD_OPENGL)
-add_subdirectory(src/renderers/gl)
+	add_subdirectory(src/renderers/gl)
 endif (CROWN_BUILD_OPENGL)
 
 if (CROWN_BUILD_OPENGLES)
-add_subdirectory(src/renderers/gles)
+	add_subdirectory(src/renderers/gles)
 endif (CROWN_BUILD_OPENGLES)
 
 if (CROWN_BUILD_TOOLS)
-add_subdirectory(tools)
+	add_subdirectory(tools)
 endif (CROWN_BUILD_TOOLS)
 
 if (CROWN_BUILD_SAMPLES)
-add_subdirectory(samples)
+	add_subdirectory(samples)
 endif (CROWN_BUILD_SAMPLES)
 
 if (CROWN_BUILD_TESTS)
-add_subdirectory(tests)
+	add_subdirectory(tests)
 endif (CROWN_BUILD_TESTS)
 
-# detect operating system
-if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-	set(LINUX 1)
-	add_subdirectory(src/os/linux)
-endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-
-if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-	set (WINDOWS 1)
-	add_subdirectory(src/os/win)
-endif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-
-# set config options
-if (CROWN_BUILD_OPENGL)
-set(CROWN_USE_OPENGL 1)
-endif (CROWN_BUILD_OPENGL)
-
-if (CROWN_BUILD_OPENGLES)
-set(CROWN_USE_OPENGLES 1)
-endif (CROWN_BUILD_OPENGLES)
-
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/src/Config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/src/Config.h)
 

src/CMakeLists.txt

@@ -279,3 +279,20 @@ set (SOURCES
 
 link_libraries(rt z)
 add_library(crown STATIC ${SOURCES})
+
+if (CROWN_BUILD_OPENGL)
+target_link_libraries(crown crown-gl)
+endif (CROWN_BUILD_OPENGL)
+
+if (CROWN_BUILD_OPENGLES)
+target_link_libraries(crown crown-gles)
+endif (CROWN_BUILD_OPENGLES)
+
+if (LINUX)
+target_link_libraries(crown crown-linux)
+endif (LINUX)
+
+if (WINDOWS)
+target_link_libraries(crown crown-win)
+endif (WINDOWS)
+

src/Config.h.in

@@ -1,5 +1,5 @@
 #cmakedefine LINUX
 #cmakedefine WINDOWS
-#cmakedefine CROWN_USE_OPENGL
-#cmakedefine CROWN_USE_OPENGLES
+#cmakedefine CROWN_BUILD_OPENGL
+#cmakedefine CROWN_BUILD_OPENGLES
 #cmakedefine CROWN_USE_FLOAT

src/renderers/gles/CMakeLists.txt

@@ -16,7 +16,7 @@ set (GLES_HEADERS
 	GLESUtils.h
 )
 
-link_libraries(GLES)
+link_libraries(GLESv1_CM)
 
 add_library(crown-gles STATIC ${GLES_SRC} ${GLES_HEADERS})