ryansnewell
/
mcserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed a number of windows issues

master
tycho 2013-12-19 15:07:45 +00:00
parent 95c7407dd3
commit 7d096c41f7
2 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@ -50,3 +50,10 @@ install_mainfest.txt
src/MCServer src/MCServer
lib/tolua++/tolua lib/tolua++/tolua
src/Bindings/Bindings.* src/Bindings/Bindings.*
#win32 cmake stuff
*.vcxproj
*.vcxproj.filters
*.opensdf
*.sdf
*.sln

41
src/CMakeLists.txt
View File

@ -9,24 +9,39 @@ endif()
include_directories (SYSTEM "${PROJECT_SOURCE_DIR}/../lib/") include_directories (SYSTEM "${PROJECT_SOURCE_DIR}/../lib/")
include_directories (SYSTEM "${PROJECT_SOURCE_DIR}/../lib/jsoncpp/include") include_directories (SYSTEM "${PROJECT_SOURCE_DIR}/../lib/jsoncpp/include")
add_subdirectory(OSSupport) set(FOLDERS OSSupport HTTPServer Bindings Items Blocks Protocol Generating)
add_subdirectory(HTTPServer) set(FOLDERS ${FOLDERS} WorldStorage Mobs Entities Simulator UI BlockEntities)
add_subdirectory(Bindings)
add_subdirectory(Items)
add_subdirectory(Blocks)
add_subdirectory(Protocol)
add_subdirectory(Generating)
add_subdirectory(WorldStorage)
add_subdirectory(Mobs)
add_subdirectory(Entities)
add_subdirectory(Simulator)
add_subdirectory(UI)
add_subdirectory(BlockEntities)
if(NOT WIN32)
foreach(folder ${FOLDERS})
add_subdirectory(${folder})
endforeach(folder)
file(GLOB SOURCE file(GLOB SOURCE
"*.cpp" "*.cpp"
) )
else()
function(includefolder PATH)
FILE(GLOB FOLDER_FILES
"${PATH}/*.cpp"
"${PATH}/*.h"
)
source_group("Source Files\\${PATH}" FILES ${FOLDER_FILES})
endfunction(includefolder)
foreach(folder ${FOLDERS})
includefolder(${folder})
endforeach(folder)
file(GLOB_RECURSE SOURCE
"*.cpp"
"*.h"
)
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")