diff options
| author | realtradam <[email protected]> | 2023-05-03 22:01:52 -0400 |
|---|---|---|
| committer | realtradam <[email protected]> | 2023-05-03 22:01:52 -0400 |
| commit | 2709a71f46acb65535a8ee871a352d2ff1fb82df (patch) | |
| tree | 33383118312a364f491c93770da53c16c7f21141 /CMakeLists.txt | |
| parent | 87ca456c3f3e97f149604bc033fdd57998e2dcd4 (diff) | |
| download | RodeoKit-2709a71f46acb65535a8ee871a352d2ff1fb82df.tar.gz RodeoKit-2709a71f46acb65535a8ee871a352d2ff1fb82df.zip | |
fix cmake build files for both linux and web
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index de61cfd..fbd4e7a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,22 +62,10 @@ if(DEFINED EMSCRIPTEN) set_target_properties(bimg PROPERTIES IMPORTED_LOCATION "${BINARY_DIR}/.build/wasm/bin/bimgRelease.bc") add_dependencies(bimg project_bgfx) - target_include_directories(${PROJECT_NAME} - PRIVATE external/bgfx/include - PRIVATE external/bx/include - PRIVATE external/cglm/include - PRIVATE src - PUBLIC include - ) - # `SYSTEM` setting ignores warnings from this external header - target_include_directories(${PROJECT_NAME} - SYSTEM PUBLIC external/STC/include - ) target_link_directories(${PROJECT_NAME} PRIVATE external/bgfx ) target_link_options(${PROJECT_NAME} - PUBLIC "-lSDL" PUBLIC "-sMAX_WEBGL_VERSION=2" PUBLIC "-sMIN_WEBGL_VERSION=2" PUBLIC "-sWASM=1" @@ -87,7 +75,7 @@ if(DEFINED EMSCRIPTEN) PUBLIC "-sALLOW_MEMORY_GROWTH=1" PUBLIC "-sUSE_SDL=2" PUBLIC "-sUSE_SDL_IMAGE=2" - PUBLIC "-sSDL2_IMAGE_FORMATS='[\"png\"]'" + PUBLIC "-sUSE_SDL_MIXER=2" ) target_link_libraries(${PROJECT_NAME} PRIVATE PRIVATE cglm @@ -98,8 +86,12 @@ if(DEFINED EMSCRIPTEN) target_compile_options(${PROJECT_NAME} PUBLIC "-fno-exceptions" PUBLIC "-fno-rtti" + PUBLIC "-sUSE_SDL=2" + PUBLIC "-sUSE_SDL_IMAGE=2" + PUBLIC "-sUSE_SDL_MIXER=2" ) elseif(DEFINED UNIX AND NOT DEFINED APPLE) + add_definitions(-DSDL_VIDEO_DRIVER_X11) option(CGLM_SHARED "Shared build" OFF) option(CGLM_STATIC "Static build" ON) add_subdirectory(external/cglm) @@ -133,17 +125,8 @@ elseif(DEFINED UNIX AND NOT DEFINED APPLE) target_include_directories(${PROJECT_NAME} PRIVATE external/SDL/include - PRIVATE external/SDL_image/include + PRIVATE external/SDL_image PRIVATE external/SDL_mixer/include - PRIVATE external/bgfx/include - PRIVATE external/bx/include - PRIVATE external/cglm/include - PRIVATE src - PUBLIC include - ) - # `SYSTEM` setting ignores warnings from this external header - target_include_directories(${PROJECT_NAME} - SYSTEM PUBLIC external/STC/include ) target_link_directories(${PROJECT_NAME} @@ -163,6 +146,20 @@ elseif(DEFINED UNIX AND NOT DEFINED APPLE) ) endif() +target_include_directories(${PROJECT_NAME} + PRIVATE external/bgfx/include + PRIVATE external/bx/include + PRIVATE external/cglm/include + PRIVATE src + PUBLIC include +) + + +# `SYSTEM` setting ignores warnings from this external header +target_include_directories(${PROJECT_NAME} + SYSTEM PUBLIC external/STC/include + ) + add_dependencies(RodeoKit project_bgfx) # build shaders |