From 473a1a4a48003e926ebed16f3535f57bfcf371d9 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Wed, 4 Jan 2012 12:39:53 +0100
Subject: gbuild: define NOMINMAX in windows.mk

---
 avmedia/Library_avmediawin.mk           | 4 ----
 sfx2/Library_sfx.mk                     | 2 +-
 solenv/gbuild/platform/WNT_INTEL_GCC.mk | 6 ------
 solenv/gbuild/platform/WNT_INTEL_MSC.mk | 6 ------
 solenv/gbuild/platform/windows.mk       | 8 ++++++++
 sot/Library_sot.mk                      | 2 +-
 svtools/Library_svt.mk                  | 2 +-
 tools/Library_tl.mk                     | 2 +-
 vcl/Library_vcl.mk                      | 2 +-
 9 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk
index df0e5d8bc575..bf09a03721ee 100644
--- a/avmedia/Library_avmediawin.mk
+++ b/avmedia/Library_avmediawin.mk
@@ -35,10 +35,6 @@ $(eval $(call gb_Library_set_include,avmediawin,\
 	-I$(realpath $(SRCDIR)/avmedia/source/inc) \
 ))
 
-$(eval $(call gb_Library_add_defs,avmediawin,\
-	-DNOMINMAX \
-))
-
 $(eval $(call gb_Library_add_api,avmediawin,\
 	udkapi \
 	offapi \
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 893aa3fb4151..b8f5d3724a19 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -53,7 +53,7 @@ $(eval $(call gb_Library_set_include,sfx,\
 ))
 
 $(eval $(call gb_Library_add_defs,sfx,\
-    -DSFX2_DLLIMPLEMENTATION -DNOMINMAX \
+    -DSFX2_DLLIMPLEMENTATION \
 ))
 
 ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
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:
diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk
index 1c008a132466..cc5271d1d33f 100644
--- a/sot/Library_sot.mk
+++ b/sot/Library_sot.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Library_add_api,sot,\
 ))
 
 $(eval $(call gb_Library_add_defs,sot,\
-    -DSOT_DLLIMPLEMENTATION -DNOMINMAX\
+    -DSOT_DLLIMPLEMENTATION \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,sot,\
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 0cba018ca958..d987e59ec7cc 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -49,7 +49,7 @@ $(eval $(call gb_Library_set_include,svt,\
 ))
 
 $(eval $(call gb_Library_add_defs,svt,\
-    -DSVT_DLLIMPLEMENTATION -DNOMINMAX\
+    -DSVT_DLLIMPLEMENTATION \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,svt,\
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 30bf9fd02e1e..0a3ee9364fd8 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_Library_set_include,tl,\
 ))
 
 $(eval $(call gb_Library_add_defs,tl,\
-    -DTOOLS_DLLIMPLEMENTATION -DNOMINMAX\
+    -DTOOLS_DLLIMPLEMENTATION \
 ))
 
 $(eval $(call gb_Library_add_api,tl,\
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 95a307f34b5e..f18c18f2ab47 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -53,7 +53,7 @@ $(eval $(call gb_Library_set_include,vcl,\
 ))
 
 $(eval $(call gb_Library_add_defs,vcl,\
-    -DVCL_DLLIMPLEMENTATION -DNOMINMAX \
+    -DVCL_DLLIMPLEMENTATION \
     -DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,cui)\" \
     -DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \
 ))
-- 
cgit