diff options
| author | Bastiaan Olij <mux213@gmail.com> | 2021-08-21 21:50:22 +1000 |
|---|---|---|
| committer | Bastiaan Olij <mux213@gmail.com> | 2021-09-27 23:08:09 +1000 |
| commit | df9164b9bd7b4505a9918212e39451b75a38a7d7 (patch) | |
| tree | a8c37eec9d9f8efdfb90ed5799950939e6b4310c /test/SConstruct | |
| parent | f3dea4b752b4f6349f4ae7aedc9fc010354729f4 (diff) | |
| download | redot-cpp-df9164b9bd7b4505a9918212e39451b75a38a7d7.tar.gz | |
Added TYPED_METHOD_BIND and c++17 flags to windows build and moved test project files
Diffstat (limited to 'test/SConstruct')
| -rw-r--r-- | test/SConstruct | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/test/SConstruct b/test/SConstruct index b9d1320..074952d 100644 --- a/test/SConstruct +++ b/test/SConstruct @@ -25,7 +25,7 @@ opts.Add( ) opts.Add(EnumVariable("bits", "Target platform bits", "64", ("32", "64"))) opts.Add(BoolVariable("use_llvm", "Use the LLVM / Clang compiler", "no")) -opts.Add(PathVariable("target_path", "The path where the lib is installed.", "bin/", PathVariable.PathAccept)) +opts.Add(PathVariable("target_path", "The path where the lib is installed.", "demo/bin/", PathVariable.PathAccept)) opts.Add(PathVariable("target_name", "The library name.", "libgdexample", PathVariable.PathAccept)) # Local dependency paths, adapt them to your setup @@ -106,14 +106,18 @@ elif env["platform"] == "windows": env.Append(CPPDEFINES=["WIN32", "_WIN32", "_WINDOWS", "_CRT_SECURE_NO_WARNINGS"]) env.Append(CCFLAGS=["-W3", "-GR"]) + env.Append(CXXFLAGS=["-std:c++17"]) if env["target"] in ("debug", "d"): env.Append(CPPDEFINES=["_DEBUG"]) - env.Append(CCFLAGS=["-EHsc", "-MDd", "-ZI"]) + env.Append(CCFLAGS=["-EHsc", "-MDd", "-ZI", "-FS"]) env.Append(LINKFLAGS=["-DEBUG"]) else: env.Append(CPPDEFINES=["NDEBUG"]) env.Append(CCFLAGS=["-O2", "-EHsc", "-MD"]) + if not(env["use_llvm"]): + env.Append(CPPDEFINES=["TYPED_METHOD_BIND"]) + if env["target"] in ("debug", "d"): cpp_library += ".debug" else: |