Explorar o código

cmake files cleaned and fixed

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

+ 3 - 1
CMakeLists.txt

@@ -79,10 +79,12 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 	
 	list (APPEND CROWN_THIRD_INCLUDES
 		${CROWN_THIRD}/zlib/include
+		${CROWN_THIRD}/luajit/include/luajit-2.0
 	)
 
 	list (APPEND CROWN_THIRD_LIBS
 		${CROWN_THIRD}/zlib/lib
+		${CROWN_THIRD}/luajit/lib
 	)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 
@@ -91,7 +93,7 @@ link_directories(${CROWN_THIRD_LIBS})
 
 # add build directories
 add_subdirectory(src)
-add_subdirectory(${CROWN_THIRD})
+add_subdirectory(${CROWN_THIRD}) #necessary?
 
 if (CROWN_BUILD_TOOLS)
 	add_subdirectory(tools)

+ 1 - 6
src/CMakeLists.txt

@@ -344,7 +344,7 @@ if (WINDOWS)
 		lua51
 	)
 
-	set(COMPILER_FLAGS)
+	set (COMPILER_FLAGS /link /OPT:NOREF)
 	
 	set (CROWN_EXECUTABLE_NAME crown-win)
 	set (CROWN_MAIN_SRC os/win/main.cpp)
@@ -402,13 +402,8 @@ add_subdirectory(lua)
 
 add_definitions(${CROWN_COMPILER_FLAGS})
 
-if (WINDOWS)
-add_definitions(/link /OPT:NOREF)
-endif (WINDOWS)
-
 add_library(crown STATIC ${CROWN_SOURCES} ${CROWN_HEADERS})
 
-
 add_executable(${CROWN_EXECUTABLE_NAME} ${CROWN_MAIN_SRC})
 target_link_libraries(${CROWN_EXECUTABLE_NAME} crown crownlua)