Daniele Bartolini 12 лет назад
Родитель
Сommit
fd4ec84b1d
1 измененных файлов с 32 добавлено и 13 удалено
  1. 32 13
      tools/CMakeLists.txt

+ 32 - 13
tools/CMakeLists.txt

@@ -3,42 +3,62 @@ cmake_minimum_required(VERSION 2.8)
 project(crown-tools)
 
 set (INCLUDES
+	core
+	core/formats
+	core/strings
 	compilers
+	compilers/tga
+)
+
+set (CORE_SRC
+	core/Args.cpp
+)
+
+set (CORE_HEADERS
+	core/Args.h
+	core/Assert.h
+	core/Types.h
+
+	core/formats/PixelFormat.h
+	core/formats/ResourceFormat.h
+	core/formats/TextureFormat.h
+
+	core/strings/StringUtils.h
+	core/strings/Hash.h
+	core/strings/Path.h
 )
 
 set (COMPILERS_SRC
 	compilers/Compiler.cpp
 	compilers/tga/TGACompiler.cpp
-	compilers/txt/TXTCompiler.cpp
-	compilers/ps/PSCompiler.cpp
-	compilers/vs/VSCompiler.cpp
+#	compilers/ps/PSCompiler.cpp
+#	compilers/vs/VSCompiler.cpp
 )
 
 set (COMPILER_HEADERS
 	compilers/Compiler.h
 	compilers/tga/TGACompiler.h
-	compilers/txt/TXTCompiler.h
-	compilers/ps/PSCompiler.h
-	compilers/vs/VSCompiler.h
+#	compilers/ps/PSCompiler.h
+#	compilers/vs/VSCompiler.h
 )
 
 set (TOOLS_SRC
+	${CORE_SRC}
 	${COMPILERS_SRC}
 )
 
 set (TOOLS_HEADERS
+	${CORE_HEADERS}
 	${COMPILERS_HEADERS}
 )
 
 include_directories(${INCLUDES})
 
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/Config.h)
+
 # tools library
 add_library(crown-tools ${TOOLS_SRC} ${TOOLS_HEADERS})
 
-# resource-linker
-add_executable(resource-linker cli/resource-linker.cpp)
-target_link_libraries(resource-linker crown-tools)
-
 # resource-hash
 add_executable(resource-hash cli/resource-hash.cpp)
 target_link_libraries(resource-hash crown-tools)
@@ -49,12 +69,11 @@ target_link_libraries(resource-compiler crown-tools)
 
 install (TARGETS crown-tools DESTINATION lib/${CMAKE_PROJECT_NAME})
 
-install (TARGETS resource-linker DESTINATION bin)
 install (TARGETS resource-hash DESTINATION bin)
 install (TARGETS resource-compiler DESTINATION bin)
 install (FILES cli/resource-compiler.py PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
 	GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION bin)
 
-add_subdirectory(editors/resource-browser)
-add_subdirectory(editors/toolchain)
+add_subdirectory(gui/resource-browser)
+add_subdirectory(gui/toolchain)
 add_subdirectory(pycrown)