Merge branch 'linux' of https://github.com/q4a/xray-16 into linux

Author: q4a

src/CMakeLists.txt

@@ -1,4 +1,4 @@
-#add_subdirectory(utils)
+add_subdirectory(utils)
 add_subdirectory(Layers)
 #add_subdirectory(xrMisc)
 #add_subdirectory(xrAICore)
@@ -7,7 +7,7 @@ add_subdirectory(xrCore)
 #add_subdirectory(xrEngine)
 #add_subdirectory(xrGame)
 #add_subdirectory(xrNetServer)
-#add_subdirectory(xrParticles)
+add_subdirectory(xrParticles)
 add_subdirectory(xrPhysics)
 add_subdirectory(xrScriptEngine)
 add_subdirectory(xrSound)

src/utils/CMakeLists.txt

@@ -0,0 +1 @@
+add_subdirectory(xrLCUtil)

src/utils/xrLCUtil/CMakeLists.txt

@@ -0,0 +1,22 @@
+project(xrLCUtil)
+
+list(APPEND DIRS
+	"."
+	)
+
+add_dir("${DIRS}")
+
+include_directories(
+	${CMAKE_CURRENT_SOURCE_DIR}/../.. 
+	${CMAKE_CURRENT_SOURCE_DIR}/../../../sdk/include
+	)
+
+list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/./LevelCompilerLoggerWindow.cpp")
+list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./LevelCompilerLoggerWindow.hpp")
+list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./ILevelCompilerLogger.hpp")
+
+add_definitions(-DXRLCUTIL_EXPORTS)
+add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})
+
+set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
+target_link_libraries(${PROJECT_NAME} xrCore)

src/xrParticles/CMakeLists.txt

@@ -0,0 +1,21 @@
+project(xrParticles)
+
+list(APPEND DIRS
+	"."
+	)
+
+add_dir("${DIRS}")
+
+include_directories(
+	${CMAKE_CURRENT_SOURCE_DIR}/.. 
+	${CMAKE_CURRENT_SOURCE_DIR}/../../sdk/include
+	)
+
+#list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/./xr_cda.cpp")
+#list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./xr_cda.h")
+
+add_definitions(-DXR_PARTICLES_EXPORTS)
+add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})
+
+set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
+target_link_libraries(${PROJECT_NAME} xrCore)

src/xrPhysics/CMakeLists.txt

@@ -13,11 +13,10 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/../../Externals/ode/include
 	${CMAKE_CURRENT_SOURCE_DIR}/../../sdk/include
 	)
-message( "src list " ${${PROJECT_NAME}__SOURCES})
+
 list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/tri-colliderKNoOPC/dcTriListCollider.cpp")
 #list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./xr_cda.h")
 
-message( "src list after" ${${PROJECT_NAME}__SOURCES})
 add_definitions(-DXRPHYSICS_EXPORTS -DdSINGLE -D_SECURE_SCL=0)
 add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})