flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

fixed compile errors with headers and math library

Browse Source
This commit is contained in:
tycho 2013-12-20 00:22:06 +00:00
parent 095c335e82
commit c7d766bbcc
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/tolua++/CMakeLists.txt
View File

@ -18,4 +18,8 @@ add_executable(tolua ${BIN_SOURCE})
add_library(tolualib ${LIB_SOURCE}) add_library(tolualib ${LIB_SOURCE})
#m is the standard math librarys #m is the standard math librarys
target_link_libraries(tolua lua m tolualib) if(UNIX)
target_link_libraries(m)
endif()
target_link_libraries(tolua lua tolualib)

21
src/CMakeLists.txt
View File

@ -28,7 +28,8 @@ function(includefolder PATH)
"${PATH}/*.cpp" "${PATH}/*.cpp"
"${PATH}/*.h" "${PATH}/*.h"
) )
source_group("Source Files\\${PATH}" FILES ${FOLDER_FILES}) source_group("${PATH}" FILES ${FOLDER_FILES})
endfunction(includefolder) endfunction(includefolder)
foreach(folder ${FOLDERS}) foreach(folder ${FOLDERS})
@ -37,16 +38,24 @@ endforeach(folder)
file(GLOB_RECURSE SOURCE file(GLOB_RECURSE SOURCE
"*.cpp" "*.cpp"
"*.h"
) )
source_group("" FILES ${SOURCE})
endif() endif()
list(REMOVE_ITEM SOURCE "${PROJECT_SOURCE_DIR}/StackWalker.cpp" "${PROJECT_SOURCE_DIR}/LeakFinder.cpp") list(REMOVE_ITEM SOURCE "${PROJECT_SOURCE_DIR}/StackWalker.cpp" "${PROJECT_SOURCE_DIR}/LeakFinder.cpp")
add_executable(../MCServer/MCServer ${SOURCE}) if(UNIX)
set(EXECUTABLE ../MCServer/MCServer)
else()
set(EXECUTABLE MCServer)
endif()
target_link_libraries(../MCServer/MCServer OSSupport HTTPServer iniFile Bindings Items Blocks) add_executable(${EXECUTABLE} ${SOURCE})
target_link_libraries(../MCServer/MCServer Protocol Generating WorldStorage jsoncpp cryptopp)
target_link_libraries(../MCServer/MCServer Mobs Entities Simulator UI zlib lua BlockEntities) target_link_libraries(${EXECUTABLE} OSSupport HTTPServer iniFile Bindings Items Blocks)
target_link_libraries(../MCServer/MCServer md5 luaexpat) target_link_libraries(${EXECUTABLE} Protocol Generating WorldStorage jsoncpp cryptopp)
target_link_libraries(${EXECUTABLE} Mobs Entities Simulator UI zlib lua BlockEntities)
target_link_libraries(${EXECUTABLE} md5 luaexpat)