Commit files changed by file_format.sh

This commit is contained in:
Aaron Franke
2020-08-13 20:53:31 -05:00
parent 0c448d94e9
commit 32cfbfd88a
15 changed files with 20 additions and 23 deletions

View File

@@ -5,7 +5,7 @@ import os
platform = ARGUMENTS.get("p", "linux")
platform = ARGUMENTS.get("platform", platform)
# This makes sure to keep the session environment variables on windows,
# This makes sure to keep the session environment variables on windows,
# that way you can run scons in a vs 2017 prompt and it will find all the required tools
env = Environment()
if platform == "windows":
@@ -21,7 +21,7 @@ target = ARGUMENTS.get("target", "debug")
if ARGUMENTS.get("use_llvm", "no") == "yes":
env["CXX"] = "clang++"
# put stuff that is the same for all first, saves duplication
# put stuff that is the same for all first, saves duplication
if platform == "osx":
env.Append(CCFLAGS = ['-g','-O3', '-std=c++14', '-arch', 'x86_64'])
env.Append(LINKFLAGS = ['-arch', 'x86_64', '-framework', 'Cocoa', '-Wl,-undefined,dynamic_lookup'])

View File

@@ -21,7 +21,6 @@ public:
}
int test_method(String s) {
Godot::print(s);
count++;
@@ -49,4 +48,4 @@ public:
static void _register_methods() {
register_method("test_method", &TestClass::test_method);
}
};
};