diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-01-04 12:39:53 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-01-04 12:39:53 +0100 |
| commit | 473a1a4a48003e926ebed16f3535f57bfcf371d9 (patch) | |
| tree | 5877a388a764dec55eaec1d91d733e3c441efd4c /solenv | |
| parent | 752f69bad43c86cc18f45b418de25a0f770baa3e (diff) | |
gbuild: define NOMINMAX in windows.mk
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_GCC.mk | 6 | ||||
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_MSC.mk | 6 | ||||
| -rw-r--r-- | solenv/gbuild/platform/windows.mk | 8 |
3 files changed, 8 insertions, 12 deletions
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 1a6b095c3d71..9e0109b350b8 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -36,12 +36,6 @@ include $(GBUILDDIR)/platform/windows.mk gb_RC := $(WINDRES) -gb_OSDEFS := \ - -DWINVER=0x0500 \ - -D_WIN32_IE=0x0500 \ - -DWIN32 \ - -DWNT \ - ifeq ($(GXX_INCLUDE_PATH),) GXX_INCLUDE_PATH=$(COMPATH)/include/c++/$(shell gcc -dumpversion) endif diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 36c95f6c346f..ab8446d46481 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -49,12 +49,6 @@ ifneq ($(origin CXX),default) gb_CXX := $(CXX) endif -gb_OSDEFS := \ - -DWINVER=0x0500 \ - -D_WIN32_IE=0x0500 \ - -DWIN32 \ - -DWNT \ - gb_COMPILERDEFS := \ -DMSC \ -D_CRT_NON_CONFORMING_SWPRINTFS \ diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index 35658b2036d7..5207cb506729 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -31,4 +31,12 @@ gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XXXXXX +gb_OSDEFS := \ + -DWINVER=0x0500 \ + -D_WIN32_IE=0x0500 \ + -DWIN32 \ + -DWNT \ + -DNOMINMAX \ + + # vim:set noexpandtab: |