JCS-Prod/RSE-Model
1
0
Fork 0
Code Issues 5 Pull Requests Packages Releases 2 Activity

Minor feature update #24

Merged
JackCarterSmith merged 2 commits from develop into master 2023-01-18 19:47:19 +01:00
Conversation 0 Commits 2 Files Changed 13 +10 -8
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7ba1037230 - Show all commits

14
RSEModel/CMakeLists.txt
View File

@ -14,10 +14,10 @@ if(BUILD_TOOLS)
# Import needed packages and references their include path # Import needed packages and references their include path
find_package(GLEW REQUIRED) find_package(GLEW REQUIRED)
include_directories(${GLEW_INCLUDE_DIR}) include_directories(${GLEW_INCLUDE_DIR})
find_package(Vulkan REQUIRED) #find_package(Vulkan REQUIRED)
include_directories(${Vulkan_INCLUDE_DIR}) #include_directories(${Vulkan_INCLUDE_DIR})
find_package(vulkan-memory-allocator REQUIRED) #find_package(vulkan-memory-allocator REQUIRED)
include_directories(${vulkan-memory-allocator_INCLUDE_DIR}) #include_directories(${vulkan-memory-allocator_INCLUDE_DIR})
# Define src/headers files # Define src/headers files
@ -47,8 +47,10 @@ if(BUILD_TOOLS)
# Link externals libraries to the linker # Link externals libraries to the linker
if(RSPMODEL_SHARED) if(RSPMODEL_SHARED)
target_link_libraries(rse-model PRIVATE rsp-model-lib ${GLEW_LIBRARIES} ${Vulkan_LIBRARIES} ${AUX_LIBS}) #target_link_libraries(rse-model PRIVATE rsp-model-lib ${GLEW_LIBRARIES} ${Vulkan_LIBRARIES} ${AUX_LIBS})
target_link_libraries(rse-model PRIVATE rsp-model-lib ${GLEW_LIBRARIES} ${AUX_LIBS})
elseif(RSPMODEL_STATIC) elseif(RSPMODEL_STATIC)
target_link_libraries(rse-model PRIVATE rsp-model-libstatic ${GLEW_LIBRARIES} ${Vulkan_LIBRARIES} ${AUX_LIBS}) #target_link_libraries(rse-model PRIVATE rsp-model-libstatic ${GLEW_LIBRARIES} ${Vulkan_LIBRARIES} ${AUX_LIBS})
target_link_libraries(rse-model PRIVATE rsp-model-libstatic ${GLEW_LIBRARIES} ${AUX_LIBS})
endif() endif()
endif() endif()

4
conanfile.txt
View File

@ -3,8 +3,8 @@
#glu/system #glu/system
glew/2.2.0 glew/2.2.0
#vulkan-headers/1.3.236.0 #vulkan-headers/1.3.236.0
vulkan-memory-allocator/3.0.1 #vulkan-memory-allocator/3.0.1
vulkan-loader/1.3.236.0 #vulkan-loader/1.3.236.0
[generators] [generators]
cmake cmake