浏览代码

some notes added to CMake files in src

mikymod 12 年之前
父节点
当前提交
a4d66e87e0
共有 3 个文件被更改,包括 19 次插入14 次删除
  1. 11 13
      CMakeLists.txt
  2. 8 1
      src/CMakeLists.txt
  3. 0 0
      third/win64/CMakeLists.txt

+ 11 - 13
CMakeLists.txt

@@ -82,17 +82,15 @@ link_directories(${CROWN_LUAJIT_LIBS})
 add_subdirectory(src)
 add_subdirectory(${CROWN_THIRD})
 
-#if (CROWN_BUILD_TOOLS)
-#	add_subdirectory(tools)
-#endif (CROWN_BUILD_TOOLS)
-#
-#if (CROWN_BUILD_SAMPLES)
-#	add_subdirectory(samples)
-#endif (CROWN_BUILD_SAMPLES)
-#
-#if (CROWN_BUILD_TESTS)
-#	add_subdirectory(tests)
-#endif (CROWN_BUILD_TESTS)
-#
-#add_subdirectory(lua)
+if (CROWN_BUILD_TOOLS)
+	add_subdirectory(tools)
+endif (CROWN_BUILD_TOOLS)
+if (CROWN_BUILD_SAMPLES)
+	add_subdirectory(samples)
+endif (CROWN_BUILD_SAMPLES)
+
+if (CROWN_BUILD_TESTS)
+	add_subdirectory(tests)
+endif (CROWN_BUILD_TESTS)
+add_subdirectory(lua)
 

+ 8 - 1
src/CMakeLists.txt

@@ -237,6 +237,8 @@ set (OS_HEADERS
 )
 
 # Platform independent libraries
+# FIXME: not so platform independent, name changes between different os
+# so, is better to include them in os specific chunk of cmake file
 set (CROWN_LIBRARIES
 	rt
 	z
@@ -246,7 +248,7 @@ set (CROWN_LIBRARIES
 set (CROWN_COMPILER_FLAGS
 	-pipe
 	-ansi
-	-W
+	-W    	# VS2010 compiler does not agreed O.o
 	-Wall
 	-Wextra
 	-Wno-long-long
@@ -334,6 +336,11 @@ if (WINDOWS)
 		renderers/gl/wgl/GLContext.h
 	)
 
+	list (
+		zlib
+		# MUST INCLUDE OTHERS
+	)
+
 	set (CROWN_EXECUTABLE_NAME crown-win)
 	set (CROWN_MAIN_SRC os/win/main.cpp)
 

+ 0 - 0
third/win64/luajit/CMakeLists.txt → third/win64/CMakeLists.txt