Explorar o código

cmake files update

mikymod %!s(int64=12) %!d(string=hai) anos
pai
achega
c74ee13303
Modificáronse 2 ficheiros con 8 adicións e 8 borrados
  1. 8 0
      CMakeLists.txt
  2. 0 8
      src/CMakeLists.txt

+ 8 - 0
CMakeLists.txt

@@ -76,6 +76,14 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 		${CMAKE_SOURCE_DIR}/src/os/win
 		${CMAKE_SOURCE_DIR}/src/os/win
 		${CMAKE_SOURCE_DIR}/src/renderers/gl/wgl
 		${CMAKE_SOURCE_DIR}/src/renderers/gl/wgl
 	)
 	)
+	
+	list (APPEND CROWN_THIRD_INCLUDES
+		${CROWN_THIRD}/zlib/include
+	)
+
+	list (APPEND CROWN_THIRD_LIBS
+		${CROWN_THIRD}/zlib/lib
+	)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 
 
 include_directories(${CROWN_INCLUDES} ${CROWN_THIRD_INCLUDES})
 include_directories(${CROWN_INCLUDES} ${CROWN_THIRD_INCLUDES})

+ 0 - 8
src/CMakeLists.txt

@@ -342,14 +342,6 @@ if (WINDOWS)
 		glew32
 		glew32
 	)
 	)
 
 
-	list (APPEND CROWN_THIRD_INCLUDES
-		${CROWN_THIRD}/zlib/include
-	)
-
-	list (APPEND CROWN_THIRD_LIBS
-		${CROWN_THIRD}/zlib/lib
-	)
-
 	set(COMPILER_FLAGS)
 	set(COMPILER_FLAGS)
 	
 	
 	set (CROWN_EXECUTABLE_NAME crown-win)
 	set (CROWN_EXECUTABLE_NAME crown-win)