@@ -35,30 +35,29 @@ if env['p'] != '':
35
35
36
36
if env ['platform' ] == '' :
37
37
print ("No valid target platform selected." )
38
- quit ();
38
+ quit ()
39
39
40
40
# Check our platform specifics
41
41
if env ['platform' ] == "osx" :
42
42
env ['target_path' ] += 'osx/'
43
43
cpp_library += '.osx'
44
+ env .Append (CCFLAGS = ['-arch' , 'x86_64' ])
45
+ env .Append (CXXFLAGS = ['-std=c++17' ])
46
+ env .Append (LINKFLAGS = ['-arch' , 'x86_64' ])
44
47
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' ])
48
49
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' ])
52
51
53
52
elif env ['platform' ] in ('x11' , 'linux' ):
54
53
env ['target_path' ] += 'x11/'
55
54
cpp_library += '.linux'
55
+ env .Append (CCFLAGS = ['-fPIC' ])
56
+ env .Append (CXXFLAGS = ['-std=c++17' ])
56
57
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' ])
59
59
else :
60
- env .Append (CCFLAGS = ['-fPIC' ,'-g' ,'-O3' ])
61
- env .Append (CXXFLAGS = ['-std=c++17' ])
60
+ env .Append (CCFLAGS = ['-g' ,'-O3' ])
62
61
63
62
elif env ['platform' ] == "windows" :
64
63
env ['target_path' ] += 'win64/'
@@ -67,11 +66,15 @@ elif env['platform'] == "windows":
67
66
# that way you can run scons in a vs 2017 prompt and it will find all the required tools
68
67
env .Append (ENV = os .environ )
69
68
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' ])
71
71
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' ])
73
75
else :
74
- env .Append (CCFLAGS = ['-O2' , '-EHsc' , '-DNDEBUG' , '-MD' ])
76
+ env .Append (CPPDEFINES = ['NDEBUG' ])
77
+ env .Append (CCFLAGS = ['-O2' , '-EHsc' , '-MD' ])
75
78
76
79
if env ['target' ] in ('debug' , 'd' ):
77
80
cpp_library += '.debug'
0 commit comments