summaryrefslogtreecommitdiff
path: root/solenv/inc/wntmsc.mk
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-08-15 16:51:38 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-08-15 16:51:38 +0300
commit5cdd571141234e73ab9d7a529fbe1c267109cc20 (patch)
tree66170aee80fd3628537a5b0d7575f8850ac6f053 /solenv/inc/wntmsc.mk
parentef2b6b2b8cfc6fcedce424bd4573a8856aee008a (diff)
Cosmetics: Factor out the -DWIN32 to CDEFS and simplify the result
Diffstat (limited to 'solenv/inc/wntmsc.mk')
-rw-r--r--solenv/inc/wntmsc.mk11
1 files changed, 3 insertions, 8 deletions
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index 3d01d29df078..e09b398b8377 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -141,15 +141,10 @@ CFLAGSCALL=-Gz
CFLAGSCC=$(ARCH_FLAGS)
.IF "$(DYNAMIC_CRT)"!=""
-CDEFSSLOMT+=-DWIN32 -D_DLL
+CDEFSSLOMT+=-D_DLL
.IF "$(NO_DYNAMIC_OBJ)"==""
-CDEFSOBJMT+=-DWIN32 -D_DLL
-.ELSE
-CDEFSOBJMT+=-DWIN32
+CDEFSOBJMT+=-D_DLL
.ENDIF # "$(NO_DYNAMIC_OBJ)"==""
-.ELSE
-CDEFSSLOMT+=-DWIN32
-CDEFSOBJMT+=-DWIN32
.ENDIF # "$(DYNAMIC_CRT)"!=""
CFLAGSPROF=-Gh -Fd$(MISC)/$(@:b).pdb
@@ -213,7 +208,7 @@ CFLAGSWERRCC=-WX
# settings.mk):
MODULES_WITH_WARNINGS :=
-CDEFS+=-D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500
+CDEFS+=-DWIN32 -D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500
.IF "$(COMEX)" == "11"
_VC_MANIFEST_BASENAME=__VC80
.ELSE