From 8d32796adb911b48aad93741ff72e0840f5e93ca Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Sun, 17 Nov 2013 16:45:44 -0500 Subject: [PATCH] rename generated logo module to logoobj --- Rakefile.rb | 4 ++-- src/gss.d | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Rakefile.rb b/Rakefile.rb index 429b1fc..46ba38f 100644 --- a/Rakefile.rb +++ b/Rakefile.rb @@ -28,7 +28,7 @@ task :default do ].each do |dir| sources += Dir["#{dir}/**/*.d"] end - sources << "build/obj2d/logo.d" + sources << "build/obj2d/logoobj.d" env["D_IMPORT_PATH"] += [ "modules/DerelictUtil/source", "modules/DerelictSDL2/source", @@ -40,7 +40,7 @@ task :default do env["DFLAGS"] += ["-fversion=Derelict3", "-fversion=gl3n", "-fversion=SDLImage"] env["LDFLAGS"] += ["-static-libgcc"] env.build_root = "build" - env.Obj2D("build/obj2d/logo.d", "model/gentex-logo.obj") + env.Obj2D("build/obj2d/logoobj.d", "model/gentex-logo.obj") env.Program("gss", sources) end end diff --git a/src/gss.d b/src/gss.d index a0378d6..5be2766 100644 --- a/src/gss.d +++ b/src/gss.d @@ -5,7 +5,7 @@ import glamour.vao; import glamour.shader; import glamour.vbo; import gl3n.linalg; -import logo; +import logoobj; enum int WIDTH = 1920; enum int HEIGHT = 1080;