diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-12-27 13:37:20 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-12-27 13:38:15 +0200 |
| commit | d72a0b5c618a37b70ba4d111b457deefad8f025f (patch) | |
| tree | 6b6d3c900397d34a73cde2ef0053a4c6154869c1 /solenv/inc | |
| parent | c318f3b0224a57102614be0efec4b49c80a3aa82 (diff) | |
Check for __GNUC__ instead of GCC in sources
We still have checks for $(COM) being GCC or MSC in makefiles, of
course. But there is no reason to pass -D$(COM) to compilations.
Checking the built-in compiler-specific macros __GNUC__, _MSC_VER
(etc) is the right thing to do.
Change-Id: Ia961a29ba74e2c4977e5300a92318f38104c6592
Diffstat (limited to 'solenv/inc')
| -rw-r--r-- | solenv/inc/set_wntx64.mk | 2 | ||||
| -rw-r--r-- | solenv/inc/settings.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk index b886aa95a372..585da405d13e 100644 --- a/solenv/inc/set_wntx64.mk +++ b/solenv/inc/set_wntx64.mk @@ -46,7 +46,7 @@ USE_CFLAGS_X64=-c -nologo -Gs $(NOLOGO) -Zm500 -Zc:forScope,wchar_t- -GR # Stack buffer overrun detection. CFLAGS+=-GS -USE_CDEFS_X64+= -D$(OS) -D$(GUI) -D$(COM) -DX86_64 -DWIN32 -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS +USE_CDEFS_X64+= -D$(OS) -D$(GUI) -DX86_64 -DWIN32 -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS .IF "$(debug)"!="" USE_CFLAGS_X64+=-Zi -Fd$(MISC_X64)/$(@:b).pdb USE_CDEFS_X64+=-DDEBUG diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 967d417e642b..b2e8f35c931b 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -799,7 +799,7 @@ CDEFS=-D$(OS) .IF "$(GUI)" != "$(OS)" CDEFS+=-D$(GUI) .ENDIF -CDEFS+=-D$(COM) -D$(CPUNAME) +CDEFS+=-D$(CPUNAME) .IF "$(USE_DEBUG_RUNTIME)" != "" CDEFS+=-D_DEBUG_RUNTIME |