$NetBSD: patch-CMakeLists.txt,v 1.2 2022/05/15 11:50:53 tnn Exp $ set correct library version disable bundled mojoshader in favor of the one from pkgsrc --- CMakeLists.txt.orig 2022-05-01 15:39:21.000000000 +0000 +++ CMakeLists.txt @@ -3,6 +3,9 @@ cmake_minimum_required(VERSION 2.8.12) project(FNA3D C) +include_directories("${PREFIX}/include" + "${X11BASE}/include") + # Options option(BUILD_SHARED_LIBS "Build shared library" ON) option(TRACING_SUPPORT "Build with tracing enabled" OFF) @@ -100,18 +103,7 @@ add_library(FNA3D src/FNA3D_PipelineCache.c src/FNA3D_Tracing.c ) -add_library(mojoshader STATIC - MojoShader/mojoshader.c - MojoShader/mojoshader_effects.c - MojoShader/mojoshader_common.c - MojoShader/mojoshader_d3d11.c - MojoShader/mojoshader_opengl.c - MojoShader/mojoshader_vulkan.c - MojoShader/profiles/mojoshader_profile_common.c - MojoShader/profiles/mojoshader_profile_glsl.c - MojoShader/profiles/mojoshader_profile_hlsl.c - MojoShader/profiles/mojoshader_profile_spirv.c -) + if(TRACING_SUPPORT) add_executable(fna3d_replay replay/replay.c) target_link_libraries(fna3d_replay FNA3D) @@ -124,9 +116,6 @@ endif() if(NOT MSVC) set_property(TARGET FNA3D PROPERTY COMPILE_FLAGS "-std=gnu99 -Wall -Wno-strict-aliasing -pedantic") endif() -if(BUILD_SHARED_LIBS) - set_property(TARGET mojoshader PROPERTY POSITION_INDEPENDENT_CODE ON) -endif() # FNA3D folders as includes, for other targets to consume target_include_directories(FNA3D PUBLIC @@ -147,10 +136,6 @@ if(BUILD_DXVK_NATIVE) $ ) endif() -target_include_directories(mojoshader PUBLIC - $ - $ -) # MinGW builds should statically link libgcc if(MINGW) @@ -178,7 +163,6 @@ else() if (TARGET SDL2::SDL2) message(STATUS "using TARGET SDL2::SDL2") target_link_libraries(FNA3D PUBLIC SDL2::SDL2) - target_link_libraries(mojoshader PUBLIC SDL2::SDL2) elseif (TARGET SDL2) message(STATUS "using TARGET SDL2") target_link_libraries(FNA3D PUBLIC SDL2)