fix pkg-config

berdal84 · Nov 27, 2024 · dcac16f · dcac16f
1 parent ce411ce
commit dcac16f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/rake/_cmake.rb b/rake/_cmake.rb
@@ -25,12 +25,10 @@ def tasks_for_cmake_target( target )
          end
          directory build_dir # ensure folder exists
          sh "cmake -S #{target.path} -B #{build_dir} -DCMAKE_OSX_DEPLOYMENT_TARGET=#{MACOSX_VERSION_MIN}" # configure
-         # TODO: we should precise which target to install
-         sh "cmake --build #{build_dir} --config #{config}"
+         sh "cmake --build #{build_dir} --config #{config} --target all"
     end
 
     task :install => :build do
-         # TODO: we should precise which target to install
          cmd = "cmake --install #{build_dir}"
          if BUILD_OS_LINUX or BUILD_OS_MACOS
              sh "sudo #{cmd}" 

diff --git a/rake/base.rb b/rake/base.rb
@@ -29,11 +29,10 @@ def new_target_from_base(name, type)
     ]
 
     target.linker_flags |= [
-        "-L#{LIB_DIR}",
-        "-Llibs/nativefiledialog-extended/build/src",        
-        "`pkg-config --cflags --libs freetype2`",
+        "-L#{LIB_DIR}", 
+        "`pkg-config --cflags --libs --static freetype2`",
         "`sdl2-config --cflags --static-libs`",
-        "-lnfd", # Native File Dialog
+        "-lnfd`", # Native File Dialog
         "-lGL",
         "-lcpptrace -ldwarf -lz -lzstd -ldl", # https://github.com/jeremy-rifkin/cpptrace?tab=readme-ov-file#use-without-cmake
     ]