瀏覽代碼

Build crown, crown-gl and crown-gles as shared libraries and create standardized crown-linux executable

Daniele Bartolini 12 年之前
父節點
當前提交
36675b79b1
共有 4 個文件被更改,包括 8 次插入9 次删除
  1. 2 2
      src/CMakeLists.txt
  2. 3 2
      src/os/linux/CMakeLists.txt
  3. 2 2
      src/renderers/gl/CMakeLists.txt
  4. 1 3
      src/renderers/gles/CMakeLists.txt

+ 2 - 2
src/CMakeLists.txt

@@ -284,7 +284,7 @@ set (CROWN_HEADERS
 )
 
 link_libraries(rt z)
-add_library(crown STATIC ${CROWN_SOURCES} ${CROWN_HEADERS})
+add_library(crown SHARED ${CROWN_SOURCES} ${CROWN_HEADERS})
 
 if (CROWN_BUILD_OPENGL)
 	target_link_libraries(crown crown-gl)
@@ -295,7 +295,7 @@ if (CROWN_BUILD_OPENGLES)
 endif (CROWN_BUILD_OPENGLES)
 
 if (LINUX)
-	target_link_libraries(crown crown-linux)
+	target_link_libraries(crown crown-linux-support)
 endif (LINUX)
 
 if (WINDOWS)

+ 3 - 2
src/os/linux/CMakeLists.txt

@@ -19,8 +19,9 @@ set (LINUX_HEADERS
 
 link_libraries(X11 Xrandr pthread)
 
-add_library(crown-linux STATIC ${LINUX_SRC} ${LINUX_HEADERS})
+add_library(crown-linux-support ${LINUX_SRC} ${LINUX_HEADERS})
+add_executable(crown-linux main.cpp)
 
 target_link_libraries(crown-linux crown)
 
-install (TARGETS crown-linux DESTINATION lib/${CMAKE_PROJECT_NAME})
+install (TARGETS crown-linux DESTINATION bin)

+ 2 - 2
src/renderers/gl/CMakeLists.txt

@@ -20,8 +20,8 @@ set (GL_HEADERS
 
 link_libraries(GL GLEW)
 
-add_library(crown-gl STATIC ${GL_SRC} ${GL_HEADERS})
+add_library(crown-gl SHARED ${GL_SRC} ${GL_HEADERS})
 
-target_link_libraries(crown-gl crown)
+#target_link_libraries(crown-gl crown)
 
 install (TARGETS crown-gl DESTINATION lib/${CMAKE_PROJECT_NAME})

+ 1 - 3
src/renderers/gles/CMakeLists.txt

@@ -18,8 +18,6 @@ set (GLES_HEADERS
 
 link_libraries(GLESv1_CM)
 
-add_library(crown-gles STATIC ${GLES_SRC} ${GLES_HEADERS})
-
-target_link_libraries(crown-gles crown)
+add_library(crown-gles SHARED ${GLES_SRC} ${GLES_HEADERS})
 
 install (TARGETS crown-gles DESTINATION lib/${CMAKE_PROJECT_NAME})