josh/jes-ruby
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

link with libjes.a as a source so Rscons picks up library file modifications

Browse Source
This commit is contained in:
Josh Holtrop 2014-06-22 21:02:02 -04:00
parent cae4b077d9
commit 1effe27afb
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Rakefile.rb
View File

@ -25,14 +25,13 @@ task :gui => :library do
base_env.clone(clone: :all) do |env| base_env.clone(clone: :all) do |env|
env.parse_flags!("!sdl2-config --cflags --libs") env.parse_flags!("!sdl2-config --cflags --libs")
env.parse_flags!("!freetype-config --cflags --libs") env.parse_flags!("!freetype-config --cflags --libs")
env["LIBPATH"] += ["lib"] env["LIBS"] += ["dl"]
env["LIBS"] += ["dl", "jes"]
if RUBY_PLATFORM =~ /mingw/ if RUBY_PLATFORM =~ /mingw/
env["LIBS"] += ["opengl32"] env["LIBS"] += ["opengl32"]
else else
env["LIBS"] += ["GL"] env["LIBS"] += ["GL"]
end 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
end end
@ -40,11 +39,10 @@ task :test => :library do
base_env.clone(clone: :all) do |env| base_env.clone(clone: :all) do |env|
env["CPPPATH"] << "gtest-#{GTEST_VERSION}/include" env["CPPPATH"] << "gtest-#{GTEST_VERSION}/include"
env["CPPPATH"] << "gtest-#{GTEST_VERSION}" env["CPPPATH"] << "gtest-#{GTEST_VERSION}"
env["LIBS"] << NAME
env["LIBPATH"] << "lib"
sources = Dir["gtest-#{GTEST_VERSION}/src/gtest-all.cc", sources = Dir["gtest-#{GTEST_VERSION}/src/gtest-all.cc",
"gtest-#{GTEST_VERSION}/src/gtest_main.cc", "gtest-#{GTEST_VERSION}/src/gtest_main.cc",
"test/src/**/*.cc"] "test/src/**/*.cc",
"lib/lib#{NAME}.a"]
env.Program("build/tests", sources) env.Program("build/tests", sources)
if RUBY_PLATFORM =~ /linux/ if RUBY_PLATFORM =~ /linux/
env["LIBS"] << "pthread" env["LIBS"] << "pthread"