Skip to content

Commit

Permalink
fix tinyxml2
Browse files Browse the repository at this point in the history
  • Loading branch information
louist103 authored Sep 11, 2024
1 parent f7dccbe commit c5baff5
Show file tree
Hide file tree
Showing 3 changed files with 5,429 additions and 8 deletions.
27 changes: 19 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ include_directories(${IMGUI_DIR})
include_directories(${IMGUI_DIR}/backends)
include_directories(extern/dr_libs)

# tinyxml2.h is in the extern folder. Only windows builds it.
if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
include_directories(extern/)
endif()

file (GLOB future__imgui
extern/imgui/imgui.cpp
extern/imgui/imgui_draw.cpp
Expand Down Expand Up @@ -53,13 +58,21 @@ file (GLOB future__utils_headers
include_directories(utils/)
source_group("Utils" REGULAR_EXPRESSION "utils/*")

if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
file (GLOB future__tinyxml2
extern/tinyxml2.cpp
)
else()
set (future__tinyxml2 "")
endif()

set(ALL_FILES
${future__imgui}
${future__main}
${future__imgui_backend}
${future__windows}
${future__utils}
${future__tinyxml2}
)

################################################################################
Expand All @@ -80,7 +93,7 @@ elseif ("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "arm64")
endif()

vcpkg_bootstrap()
vcpkg_install_packages(zlib bzip2 libzip tinyxml2 libogg libvorbis)
vcpkg_install_packages(zlib bzip2 libzip libogg libvorbis)
endif()


Expand All @@ -105,17 +118,16 @@ find_package(libzip REQUIRED)
target_link_libraries(future PRIVATE libzip::zip )






file (COPY assets/ DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/assets)

if (CMAKE_SYSTEM_NAME STREQUAL "Linux")

find_package(SDL2 REQUIRED)
target_link_libraries(future PRIVATE SDL2::SDL2)

find_package(OpenGL)
target_link_libraries(future PRIVATE OpenGL::GL)

find_library(OGG_LIB ogg)
target_link_libraries(future PRIVATE "${OGG_LIB}")

Expand All @@ -125,15 +137,14 @@ target_link_libraries(future PRIVATE "${VORBISFILE_LIB}")
find_library(TINYXML_LIB tinyxml2)
target_link_libraries(future PRIVATE "${TINYXML_LIB}")


elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")


find_package(Ogg CONFIG REQUIRED)
target_link_libraries(future PRIVATE Ogg::ogg)

find_package(Vorbis CONFIG REQUIRED)
target_link_libraries(future PRIVATE Vorbis::vorbisfile)

find_package(tinyxml2)
target_link_libraries(future PRIVATE tinyxml2::tinyxml2)

endif()
Loading

0 comments on commit c5baff5

Please sign in to comment.