Swiftdiff options
Diffstat (limited to 'Slimber')
| -rw-r--r-- | Slimber/CLI/SConscript | 7 | ||||
| -rw-r--r-- | Slimber/Cocoa/SConscript | 8 |
2 files changed, 2 insertions, 13 deletions
diff --git a/Slimber/CLI/SConscript b/Slimber/CLI/SConscript index 04e4976..e17996d 100644 --- a/Slimber/CLI/SConscript +++ b/Slimber/CLI/SConscript @@ -1,18 +1,13 @@ Import("env") myenv = env.Clone() myenv.UseFlags(env["SLIMBER_FLAGS"]) myenv.UseFlags(env["LIMBER_FLAGS"]) myenv.UseFlags(env["SWIFTOOLS_FLAGS"]) myenv.UseFlags(env["SWIFTEN_FLAGS"]) -myenv.UseFlags(env["LIBIDN_FLAGS"]) -myenv.UseFlags(env["BOOST_FLAGS"]) -myenv.UseFlags(env.get("LIBXML_FLAGS", {})) -myenv.UseFlags(env.get("EXPAT_FLAGS", {})) -myenv.UseFlags(env.get("AVAHI_FLAGS", {})) -myenv.UseFlags(myenv["PLATFORM_FLAGS"]) +myenv.UseFlags(env["SWIFTEN_DEP_FLAGS"]) myenv.Program("slimber", [ "main.cpp", "DummyMenulet.cpp", ]) diff --git a/Slimber/Cocoa/SConscript b/Slimber/Cocoa/SConscript index 1283dc7..441dc27 100644 --- a/Slimber/Cocoa/SConscript +++ b/Slimber/Cocoa/SConscript @@ -1,23 +1,17 @@ Import("env") myenv = env.Clone() myenv.UseFlags(env["LIMBER_FLAGS"]) myenv.MergeFlags(env["SLIMBER_FLAGS"]) myenv.MergeFlags(env["SWIFTOOLS_FLAGS"]) myenv.MergeFlags(env["SWIFTEN_FLAGS"]) -myenv.MergeFlags(env["LIBIDN_FLAGS"]) -myenv.MergeFlags(env["BOOST_FLAGS"]) -myenv.MergeFlags(env.get("LIBXML_FLAGS", "")) -myenv.MergeFlags(env.get("EXPAT_FLAGS", "")) -myenv.Append(CXXFLAGS = myenv["OBJCCFLAGS"]) -myenv.Append(FRAMEWORKS = "Cocoa") -myenv.MergeFlags(myenv["PLATFORM_FLAGS"]) +myenv.MergeFlags(env["SWIFTEN_DEP_FLAGS"]) myenv.Program("Slimber", [ "main.mm", "CocoaController.mm", "CocoaMenulet.mm", ]) myenv.Nib("MainMenu") |