Author: arist
Date: Wed Nov 14 22:57:17 2012
New Revision: 1409514
URL: http://svn.apache.org/viewvc?rev=1409514&view=rev
Log:
gnumake4_025_824c8caeaf61.patch
# HG changeset patch
# User mba
# Date 1299018735 -3600
# Node ID 824c8caeaf614dfd15cc0b2abf3e32a6dd58a5c6
# Parent c943ed591aff77251fe0f71f23dc536f90952349
CWS gnumake4: fixes for building with ENABLE_CAIRO on windows
Modified:
incubator/ooo/branches/gbuild/main/RepositoryFixes.mk
incubator/ooo/branches/gbuild/main/canvas/Library_cairocanvas.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk
Modified: incubator/ooo/branches/gbuild/main/RepositoryFixes.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/RepositoryFixes.mk?rev=1409514&r1=1409513&r2=1409514&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/RepositoryFixes.mk (original)
+++ incubator/ooo/branches/gbuild/main/RepositoryFixes.mk Wed Nov 14 22:57:17
2012
@@ -137,6 +137,7 @@ gb_Library_FILENAMES := $(patsubst stl:i
endif
gb_Library_NOILIBFILENAMES:=\
advapi32 \
+ cairo \
d3d9 \
d3dx \
ddraw \
Modified: incubator/ooo/branches/gbuild/main/canvas/Library_cairocanvas.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/Library_cairocanvas.mk?rev=1409514&r1=1409513&r2=1409514&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/Library_cairocanvas.mk (original)
+++ incubator/ooo/branches/gbuild/main/canvas/Library_cairocanvas.mk Wed Nov 14
22:57:17 2012
@@ -109,7 +109,7 @@ $(eval $(call gb_Library_add_exception_o
$(eval $(call gb_Library_add_linked_libs,cairocanvas,\
cairo \
gdi32 \
- msimg32 \
+ user32 \
))
else
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk?rev=1409514&r1=1409513&r2=1409514&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk
(original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk Wed
Nov 14 22:57:17 2012
@@ -76,7 +76,6 @@ gb_CFLAGS := \
-GR \
-Gs \
-GS \
- -Gy \
-nologo \
-Wall \
-wd4005 \
@@ -457,6 +456,7 @@ gb_Library_PLAINEXT := .lib
gb_Library_PLAINLIBS_NONE += \
advapi32 \
+ cairo \
d3d9 \
d3dx \
ddraw \
