diff options
| author | electromatter <electromatter@gmail.com> | 2015-09-22 04:44:34 +0200 |
|---|---|---|
| committer | electromatter <electromatter@gmail.com> | 2015-09-22 04:44:34 +0200 |
| commit | a24cc0184343416eed86b208d8a2aff2b5c0892c (patch) | |
| tree | 04ced91aa4a70b4c6e033fac4a2fc2e2ea206205 /src/CMakeLists.txt | |
| parent | added bungeecord support for protocol18x (diff) | |
| parent | Merge pull request #2488 from cuberite/ChatFlag (diff) | |
| download | cuberite-a24cc0184343416eed86b208d8a2aff2b5c0892c.tar cuberite-a24cc0184343416eed86b208d8a2aff2b5c0892c.tar.gz cuberite-a24cc0184343416eed86b208d8a2aff2b5c0892c.tar.bz2 cuberite-a24cc0184343416eed86b208d8a2aff2b5c0892c.tar.lz cuberite-a24cc0184343416eed86b208d8a2aff2b5c0892c.tar.xz cuberite-a24cc0184343416eed86b208d8a2aff2b5c0892c.tar.zst cuberite-a24cc0184343416eed86b208d8a2aff2b5c0892c.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a9e1a6606..d37ba5419 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -98,6 +98,7 @@ SET (HDRS ChunkSender.h ChunkStay.h ClientHandle.h + Color.h CommandOutput.h CompositeChat.h CraftingRecipes.h @@ -316,7 +317,7 @@ if (MSVC) OUTPUT ${BINDING_OUTPUTS} # Copy the Lua DLL into the Bindings folder, so that tolua can run from there: - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/MCServer/lua51.dll ./lua51.dll + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/Server/lua51.dll ./lua51.dll # Regenerate bindings: COMMAND tolua -L BindingsProcessor.lua -o Bindings.cpp -H Bindings.h AllToLua.pkg @@ -330,7 +331,7 @@ endif() add_executable(${EXECUTABLE} ${SOURCE}) -# Output the executable into the $/MCServer folder, so that it has access to external resources: +# Output the executable into the $/Server folder, so that it has access to external resources: set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/Server) SET_TARGET_PROPERTIES(${EXECUTABLE} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_SOURCE_DIR}/Server |