From 1effe27afbef6ecaf10ac4ad0a1be20cec409cb6 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Sun, 22 Jun 2014 21:02:02 -0400 Subject: [PATCH] link with libjes.a as a source so Rscons picks up library file modifications --- Rakefile.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Rakefile.rb b/Rakefile.rb index b1535a5..3821f82 100644 --- a/Rakefile.rb +++ b/Rakefile.rb @@ -25,14 +25,13 @@ task :gui => :library do base_env.clone(clone: :all) do |env| env.parse_flags!("!sdl2-config --cflags --libs") env.parse_flags!("!freetype-config --cflags --libs") - env["LIBPATH"] += ["lib"] - env["LIBS"] += ["dl", "jes"] + env["LIBS"] += ["dl"] if RUBY_PLATFORM =~ /mingw/ env["LIBS"] += ["opengl32"] else env["LIBS"] += ["GL"] end - env.Program("bin/jes", Dir["src/gui/**/*.{cc,c}"]) + env.Program("bin/jes", Dir["src/gui/**/*.{cc,c}", "lib/lib#{NAME}.a"]) end end @@ -40,11 +39,10 @@ task :test => :library do base_env.clone(clone: :all) do |env| env["CPPPATH"] << "gtest-#{GTEST_VERSION}/include" env["CPPPATH"] << "gtest-#{GTEST_VERSION}" - env["LIBS"] << NAME - env["LIBPATH"] << "lib" sources = Dir["gtest-#{GTEST_VERSION}/src/gtest-all.cc", "gtest-#{GTEST_VERSION}/src/gtest_main.cc", - "test/src/**/*.cc"] + "test/src/**/*.cc", + "lib/lib#{NAME}.a"] env.Program("build/tests", sources) if RUBY_PLATFORM =~ /linux/ env["LIBS"] << "pthread"