diff options
| -rw-r--r-- | gears/SConscript | 2 | ||||
| -rw-r--r-- | gears/SConscript.dll | 85 |
2 files changed, 45 insertions, 42 deletions
diff --git a/gears/SConscript b/gears/SConscript index bee00fb..75da7b1 100644 --- a/gears/SConscript +++ b/gears/SConscript @@ -254,7 +254,6 @@ env.Replace( # current build as closely as possible until we switch everyone to SCons, then # gradually integrate. env.Replace( - ARFLAGS = [], CPPPATH = [ '$OPEN_DIR', '$OPEN_DIR/..', @@ -382,6 +381,7 @@ env['I18N_LANGS'] = [ # Platform-specific flags follow. if env['OS'] in ['win32', 'wince']: + env.Replace(ARFLAGS = []) env.Append( CPPDEFINES = [ 'STRICT', diff --git a/gears/SConscript.dll b/gears/SConscript.dll index 9f4d18a..e8ab132 100644 --- a/gears/SConscript.dll +++ b/gears/SConscript.dll @@ -306,53 +306,56 @@ elif env['BROWSER'] == 'NPAPI': # Building resources. -env_res = env.Clone() -env_res.Replace( - CPPDEFINES = [ - '_UNICODE', - 'UNICODE', - '$EXTRA_DEFINES', - ], - EXTRA_DEFINES = [ - 'BROWSER_${BROWSER}=1', - ], - CPPPATH = [ - '$COMMON_GENFILES_DIR/..', - '$GENFILES_DIR/..', - '$OPEN_DIR', - '$VC80_CPPPATH', - ], -) - -if env['MODE'] == 'dbg': - env_res.Append(CPPDEFINES = 'DEBUG=1') -else: - env_res.Append(CPPDEFINES = 'NDEBUG=1') - -env_res.Append(RCFLAGS = [('/l', '0x409')]) -if env['OS'] == 'win32': - env_res.Append( - CPPPATH = [ - '$PRIVATE_THIRD_PARTY_DIR/atlmfc_vc80/files/include', - ], - ) -elif env['OS'] == 'wince': - env_res.Append( +if env['OS'] in ['win32', 'wince']: + env_res = env.Clone() + env_res.Replace( CPPDEFINES = [ - 'OS_WINCE', - '_WIN32', - '_WIN32_WCE', - 'UNDER_CE', + '_UNICODE', + 'UNICODE', + '$EXTRA_DEFINES', + ], + EXTRA_DEFINES = [ + 'BROWSER_${BROWSER}=1', ], CPPPATH = [ - '$OPEN_DIR/..', - '$PRIVATE_THIRD_PARTY_DIR/atlmfc_vc80ce/files/include', + '$COMMON_GENFILES_DIR/..', + '$GENFILES_DIR/..', + '$OPEN_DIR', + '$VC80_CPPPATH', ], - RCFLAGS = [ - '-N', - ] ) + if env['MODE'] == 'dbg': + env_res.Append(CPPDEFINES = 'DEBUG=1') + else: + env_res.Append(CPPDEFINES = 'NDEBUG=1') + + env_res.Append(RCFLAGS = [('/l', '0x409')]) + if env['OS'] == 'win32': + env_res.Append( + CPPPATH = [ + '$PRIVATE_THIRD_PARTY_DIR/atlmfc_vc80/files/include', + ], + ) + elif env['OS'] == 'wince': + env_res.Append( + CPPDEFINES = [ + 'OS_WINCE', + '_WIN32', + '_WIN32_WCE', + 'UNDER_CE', + ], + CPPPATH = [ + '$OPEN_DIR/..', + '$PRIVATE_THIRD_PARTY_DIR/atlmfc_vc80ce/files/include', + ], + RCFLAGS = [ + '-N', + ] + ) +else: + env_res = None + if env['OS'] == 'win32': # TODO: move to breakpad env.Append(CPPFLAGS = ['/wd4018']) |