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

Blocks/CMakeLists.txt: Fixed header list after merge of master

This commit is contained in:
archshift 2014-07-18 15:41:42 -07:00
parent 8325304693
commit 3d368b015e
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Blocks/CMakeLists.txt
View File

@ -75,7 +75,7 @@ SET (HDRS
BlockSand.h BlockSand.h
BlockSapling.h BlockSapling.h
BlockSideways.h BlockSideways.h
BlockSign.h BlockSignPost.h
BlockSlab.h BlockSlab.h
BlockSnow.h BlockSnow.h
BlockStairs.h BlockStairs.h
@ -89,6 +89,7 @@ SET (HDRS
BlockTripwire.h BlockTripwire.h
BlockTripwireHook.h BlockTripwireHook.h
BlockVine.h BlockVine.h
BlockWallSign.h
BlockWorkbench.h BlockWorkbench.h
BroadcastInterface.h BroadcastInterface.h
ChunkInterface.h ChunkInterface.h

13
src/CMakeLists.txt
View File

@ -248,17 +248,10 @@ set_source_files_properties(Bindings/Bindings.cpp PROPERTIES GENERATED TRUE)
set_source_files_properties(Bindings/Bindings.h PROPERTIES GENERATED TRUE) set_source_files_properties(Bindings/Bindings.h PROPERTIES GENERATED TRUE)
if (NOT MSVC) if (NOT MSVC)
# Bindings need to reference other folders, so they are done here instead # Bindings need to reference other folders, so they are done here instead
# lib dependencies are not included # lib dependencies are not included
include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/../lib/polarssl/include") include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/../lib/polarssl/include")
foreach(folder ${FOLDERS})
add_subdirectory(${folder})
endforeach(folder)
#clear file #clear file
file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/BindingDependecies.txt) file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/BindingDependecies.txt)
foreach(dependecy ${BINDING_DEPENDECIES}) foreach(dependecy ${BINDING_DEPENDECIES})
@ -268,6 +261,10 @@ if (NOT MSVC)
set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "Bindings.cpp Bindings.h") set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "Bindings.cpp Bindings.h")
foreach(folder ${FOLDERS})
add_subdirectory(${folder})
endforeach(folder)
list(APPEND SOURCE "${SRCS}") list(APPEND SOURCE "${SRCS}")
list(APPEND SOURCE "${HDRS}") list(APPEND SOURCE "${HDRS}")
@ -275,8 +272,6 @@ if (NOT MSVC)
if (WIN32) if (WIN32)
list(APPEND SOURCE "Resources/MCServer.rc") list(APPEND SOURCE "Resources/MCServer.rc")
endif() endif()
else () else ()
# MSVC-specific handling: Put all files into one project, separate by the folders: # MSVC-specific handling: Put all files into one project, separate by the folders: