Skip to content

Commit 1a58465

Browse files
authored
Merge pull request #244 from SanyaSho/dev/largeaddressaware
wscript: use "/LARGEADDRESSAWARE" on windows
2 parents 823e437 + 30f1e02 commit 1a58465

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

wscript

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -514,30 +514,32 @@ def configure(conf):
514514
'/TP',
515515
'/EHsc'
516516
]
517-
517+
518518
if conf.options.BUILD_TYPE == 'debug':
519519
linkflags += [
520520
'/INCREMENTAL:NO',
521521
'/NODEFAULTLIB:libc',
522522
'/NODEFAULTLIB:libcd',
523523
'/NODEFAULTLIB:libcmt',
524-
'/FORCE'
524+
'/FORCE',
525+
'/LARGEADDRESSAWARE'
525526
]
526527
else:
527528
linkflags += [
528529
'/INCREMENTAL',
529530
'/NODEFAULTLIB:libc',
530531
'/NODEFAULTLIB:libcd',
531-
'/NODEFAULTLIB:libcmtd'
532+
'/NODEFAULTLIB:libcmtd',
533+
'/LARGEADDRESSAWARE'
532534
]
533535

534536
linkflags += [
535537
'/LIBPATH:'+os.path.abspath('.')+'/lib/win32/'+conf.env.DEST_CPU+'/',
536538
'/LIBPATH:'+os.path.abspath('.')+'/dx9sdk/lib/'+conf.env.DEST_CPU+'/'
537539
]
538-
540+
539541
# And here C++ flags starts to be treated separately
540-
cxxflags = list(cflags)
542+
cxxflags = list(cflags)
541543
if conf.env.DEST_OS != 'win32':
542544
cxxflags += ['-std=c++11','-fpermissive']
543545

0 commit comments

Comments
 (0)