xrAPI: added to CMake linux build

OpenXRay · May 30, 2018 · 077478d · 077478d
1 parent 9c80b2e
commit 077478d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 #add_subdirectory(utils)
-#add_subdirectory(Layers)
+add_subdirectory(Layers)
 #add_subdirectory(xrMisc)
 #add_subdirectory(xrAICore)
 #add_subdirectory(xrCDB)

diff --git a/src/Layers/CMakeLists.txt b/src/Layers/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(xrAPI)
diff --git a/src/Layers/xrAPI/CMakeLists.txt b/src/Layers/xrAPI/CMakeLists.txt
@@ -0,0 +1,5 @@
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../.. ${CMAKE_CURRENT_SOURCE_DIR}/../../../sdk/include)
+
+add_library(xrAPI SHARED "xrAPI.cpp" "stdafx.h")
+
+set_target_properties(xrAPI PROPERTIES PREFIX "")
diff --git a/src/utils.cmake b/src/utils.cmake
@@ -1,11 +1,11 @@
-macro(add_dir DIRS)
+macro(add_dir DIRS PROJECT_NAME)
   foreach(dir ${DIRS})
 	message( "adding " ${dir} )
 	include_directories  (${dir} )
 	file( GLOB ${dir}__INCLUDES_H ${dir} *.h)
 	file( GLOB ${dir}__INCLUDES_HPP ${dir} *.hpp)
-	list( APPEND XRCORE__INCLUDES ${${dir}__INCLUDES_H} ${${dir}__INCLUDES_HPP} )	
+	list( APPEND ${PROJECT_NAME}__INCLUDES ${${dir}__INCLUDES_H} ${${dir}__INCLUDES_HPP} )	
 	file( GLOB ${dir}__SOURCES ${dir} *.cpp) 
-	list( APPEND XRCORE__SOURCES ${${dir}__SOURCES} )	
+	list( APPEND ${PROJECT_NAME}__SOURCES ${${dir}__SOURCES} )	
   endforeach()
 endmacro()
diff --git a/src/xrCore/CMakeLists.txt b/src/xrCore/CMakeLists.txt
@@ -10,7 +10,7 @@ add_dir (
 	"Text"
 	"Threading"
 	"XML"
-        )
+        xrCore)
 
 message( "path "  ${CMAKE_CURRENT_SOURCE_DIR} )