[Libreoffice-commits] .: 2 commits - vcl/win

[Fridrich Strba]

 vcl/win/source/gdi/MAKEFILE.MK |   69 ---------------------------------------
 vcl/win/source/gdi/makefile.mk |   72 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 69 deletions(-)

New commits:
commit aa2ce650b3eecd32107178c0ae31d15d3f26d8ee
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Mar 16 10:26:58 2011 +0100

    Another GR2_STATIC define

diff --git a/vcl/win/source/gdi/makefile.mk b/vcl/win/source/gdi/makefile.mk
index 95f282b..1863364 100644
--- a/vcl/win/source/gdi/makefile.mk
+++ b/vcl/win/source/gdi/makefile.mk
@@ -62,6 +62,9 @@ EXCEPTIONSFILES=	$(SLO)$/salprn.obj
 
 .IF "$(ENABLE_GRAPHITE)" == "TRUE"
 CFLAGS+=-DENABLE_GRAPHITE
+.IF "$(SYSTEM_GRAPHITE)" != "YES"
+CDEFS+=-DGR2_STATIC
+.ENDIF
 .ENDIF
 
 # --- Targets ------------------------------------------------------
commit 11dfa87ff9a72fed538347ddb8017d58f9358874
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Mar 16 10:25:08 2011 +0100

    MAKEFILE.MK -> makefile.mk

diff --git a/vcl/win/source/gdi/MAKEFILE.MK b/vcl/win/source/gdi/MAKEFILE.MK
deleted file mode 100644
index 7489be6..0000000
--- a/vcl/win/source/gdi/MAKEFILE.MK
+++ /dev/null
@@ -1,69 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-PRJ=..$/..$/..
-
-PRJNAME=vcl
-TARGET=salgdi
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile2.pmk
-
-# --- #105371#
-.IF "$(COM)"=="GCC"
-.ELSE
-CFLAGS += -DWINVER=0x0400
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=   $(SLO)$/salgdi.obj   \
-            $(SLO)$/salgdi2.obj  \
-            $(SLO)$/salgdi3.obj  \
-            $(SLO)$/salgdi_gdiplus.obj  \
-            $(SLO)$/salvd.obj    \
-            $(SLO)$/salprn.obj   \
-            $(SLO)$/salbmp.obj	 \
-            $(SLO)$/winlayout.obj	\
-            $(SLO)$/wntgdi.obj      \
-            $(SLO)$/salnativewidgets-luna.obj
-            
-
-EXCEPTIONSFILES=	$(SLO)$/salprn.obj
-
-.IF "$(ENABLE_GRAPHITE)" == "TRUE"
-CFLAGS+=-DENABLE_GRAPHITE
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/vcl/win/source/gdi/makefile.mk b/vcl/win/source/gdi/makefile.mk
new file mode 100644
index 0000000..95f282b
--- /dev/null
+++ b/vcl/win/source/gdi/makefile.mk
@@ -0,0 +1,69 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+
+PRJ=..$/..$/..
+
+PRJNAME=vcl
+TARGET=salgdi
+
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+.INCLUDE :  $(PRJ)$/util$/makefile2.pmk
+
+# --- #105371#
+.IF "$(COM)"=="GCC"
+.ELSE
+CFLAGS += -DWINVER=0x0400
+.ENDIF
+
+# --- Files --------------------------------------------------------
+
+SLOFILES=   $(SLO)$/salgdi.obj   \
+            $(SLO)$/salgdi2.obj  \
+            $(SLO)$/salgdi3.obj  \
+            $(SLO)$/salgdi_gdiplus.obj  \
+            $(SLO)$/salvd.obj    \
+            $(SLO)$/salprn.obj   \
+            $(SLO)$/salbmp.obj	 \
+            $(SLO)$/winlayout.obj	\
+            $(SLO)$/wntgdi.obj      \
+            $(SLO)$/salnativewidgets-luna.obj
+
+
+EXCEPTIONSFILES=	$(SLO)$/salprn.obj
+
+.IF "$(ENABLE_GRAPHITE)" == "TRUE"
+CFLAGS+=-DENABLE_GRAPHITE
+.ENDIF
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk