Merge pull request #244 from SanyaSho/dev/largeaddressaware

wscript: use "/LARGEADDRESSAWARE" on windows
This commit is contained in:
nillerusr 2023-04-29 14:28:57 +00:00 committed by GitHub
commit 1a584655d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

12
wscript
View File

@ -514,30 +514,32 @@ def configure(conf):
'/TP', '/TP',
'/EHsc' '/EHsc'
] ]
if conf.options.BUILD_TYPE == 'debug': if conf.options.BUILD_TYPE == 'debug':
linkflags += [ linkflags += [
'/INCREMENTAL:NO', '/INCREMENTAL:NO',
'/NODEFAULTLIB:libc', '/NODEFAULTLIB:libc',
'/NODEFAULTLIB:libcd', '/NODEFAULTLIB:libcd',
'/NODEFAULTLIB:libcmt', '/NODEFAULTLIB:libcmt',
'/FORCE' '/FORCE',
'/LARGEADDRESSAWARE'
] ]
else: else:
linkflags += [ linkflags += [
'/INCREMENTAL', '/INCREMENTAL',
'/NODEFAULTLIB:libc', '/NODEFAULTLIB:libc',
'/NODEFAULTLIB:libcd', '/NODEFAULTLIB:libcd',
'/NODEFAULTLIB:libcmtd' '/NODEFAULTLIB:libcmtd',
'/LARGEADDRESSAWARE'
] ]
linkflags += [ linkflags += [
'/LIBPATH:'+os.path.abspath('.')+'/lib/win32/'+conf.env.DEST_CPU+'/', '/LIBPATH:'+os.path.abspath('.')+'/lib/win32/'+conf.env.DEST_CPU+'/',
'/LIBPATH:'+os.path.abspath('.')+'/dx9sdk/lib/'+conf.env.DEST_CPU+'/' '/LIBPATH:'+os.path.abspath('.')+'/dx9sdk/lib/'+conf.env.DEST_CPU+'/'
] ]
# And here C++ flags starts to be treated separately # And here C++ flags starts to be treated separately
cxxflags = list(cflags) cxxflags = list(cflags)
if conf.env.DEST_OS != 'win32': if conf.env.DEST_OS != 'win32':
cxxflags += ['-std=c++11','-fpermissive'] cxxflags += ['-std=c++11','-fpermissive']