ref: 685d595c3085229681412fffd39cfdfc1d0d6af0
parent: 57a23406d76651ab1545e1351086ee3dda9b15dd
parent: 36cda3606e5fea5a758c824ac5ebed0c8e97ed56
author: Ethan Hugg <[email protected]>
date: Wed Apr 30 05:40:25 EDT 2014
Merge pull request #767 from mstorsjo/avoid-conflicting-msvc-options Only use the -Gm option in desktop debug MSVC builds
--- a/build/platform-msvc-common.mk
+++ b/build/platform-msvc-common.mk
@@ -23,7 +23,7 @@
CXX_LINK_O=-nologo -Fe$@
AR_OPTS=-nologo -out:$@
CFLAGS_OPT=-O2 -Ob1 -Oy- -Zi -GF -Gm- -GS -Gy -DNDEBUG
-CFLAGS_DEBUG=-Od -Oy- -ZI -Gm -RTC1 -D_DEBUG
+CFLAGS_DEBUG=-Od -Oy- -ZI -RTC1 -D_DEBUG
CFLAGS_M32=
CFLAGS_M64=
LINK_LIB=$(1).lib
--- a/build/platform-msvc.mk
+++ b/build/platform-msvc.mk
@@ -1,5 +1,5 @@
include build/platform-msvc-common.mk
LDFLAGS += user32.lib
CFLAGS_OPT += -MT
-CFLAGS_DEBUG += -MTd
+CFLAGS_DEBUG += -MTd -Gm