Skip to content

Commit 9464160

Browse files
committed
Updated SConstruct file to latest template
1 parent 228fe92 commit 9464160

File tree

3 files changed

+18
-15
lines changed

3 files changed

+18
-15
lines changed

SConstruct

+17-14
Original file line numberDiff line numberDiff line change
@@ -35,30 +35,29 @@ if env['p'] != '':
3535

3636
if env['platform'] == '':
3737
print("No valid target platform selected.")
38-
quit();
38+
quit()
3939

4040
# Check our platform specifics
4141
if env['platform'] == "osx":
4242
env['target_path'] += 'osx/'
4343
cpp_library += '.osx'
44+
env.Append(CCFLAGS=['-arch', 'x86_64'])
45+
env.Append(CXXFLAGS=['-std=c++17'])
46+
env.Append(LINKFLAGS=['-arch', 'x86_64'])
4447
if env['target'] in ('debug', 'd'):
45-
env.Append(CCFLAGS = ['-g','-O2', '-arch', 'x86_64'])
46-
env.Append(CXXFLAGS = ['-std=c++17'])
47-
env.Append(LINKFLAGS = ['-arch', 'x86_64'])
48+
env.Append(CCFLAGS=['-g', '-O2'])
4849
else:
49-
env.Append(CCFLAGS = ['-g','-O3', '-arch', 'x86_64'])
50-
env.Append(CXXFLAGS = ['-std=c++17'])
51-
env.Append(LINKFLAGS = ['-arch', 'x86_64'])
50+
env.Append(CCFLAGS=['-g', '-O3'])
5251

5352
elif env['platform'] in ('x11', 'linux'):
5453
env['target_path'] += 'x11/'
5554
cpp_library += '.linux'
55+
env.Append(CCFLAGS=['-fPIC'])
56+
env.Append(CXXFLAGS=['-std=c++17'])
5657
if env['target'] in ('debug', 'd'):
57-
env.Append(CCFLAGS = ['-fPIC','-g3','-Og'])
58-
env.Append(CXXFLAGS = ['-std=c++17'])
58+
env.Append(CCFLAGS = ['-g3','-Og'])
5959
else:
60-
env.Append(CCFLAGS = ['-fPIC','-g','-O3'])
61-
env.Append(CXXFLAGS = ['-std=c++17'])
60+
env.Append(CCFLAGS = ['-g','-O3'])
6261

6362
elif env['platform'] == "windows":
6463
env['target_path'] += 'win64/'
@@ -67,11 +66,15 @@ elif env['platform'] == "windows":
6766
# that way you can run scons in a vs 2017 prompt and it will find all the required tools
6867
env.Append(ENV = os.environ)
6968

70-
env.Append(CCFLAGS = ['-DWIN32', '-D_WIN32', '-D_WINDOWS', '-W3', '-GR', '-D_CRT_SECURE_NO_WARNINGS'])
69+
env.Append(CPPDEFINES=['WIN32', '_WIN32', '_WINDOWS', '_CRT_SECURE_NO_WARNINGS'])
70+
env.Append(CCFLAGS=['-W3', '-GR'])
7171
if env['target'] in ('debug', 'd'):
72-
env.Append(CCFLAGS = ['-EHsc', '-D_DEBUG', '-MDd'])
72+
env.Append(CPPDEFINES=['_DEBUG'])
73+
env.Append(CCFLAGS=['-EHsc', '-MDd', '-ZI'])
74+
env.Append(LINKFLAGS=['-DEBUG'])
7375
else:
74-
env.Append(CCFLAGS = ['-O2', '-EHsc', '-DNDEBUG', '-MD'])
76+
env.Append(CPPDEFINES=['NDEBUG'])
77+
env.Append(CCFLAGS=['-O2', '-EHsc', '-MD'])
7578

7679
if env['target'] in ('debug', 'd'):
7780
cpp_library += '.debug'
Binary file not shown.

demo/addons/godot-sqlite/config.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
name="Godot SQLite"
44
description="GDNative wrapper for SQLite (Godot 3.1+), making it possible to use SQLite databases as data storage in all your future games."
55
author="Piet Bronders & Jeroen De Geeter"
6-
version="1.4"
6+
version="1.6"
77
script="godot-sqlite.gd"

0 commit comments

Comments
 (0)