incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r1172091 - in /incubator/ooo/trunk/main: RepositoryFixes.mk solenv/gbuild/platform/winmingw.mk vcl/Library_vcl.mk vcl/win/source/gdi/winlayout.cxx
Date Sat, 17 Sep 2011 22:34:34 GMT
Author: mst
Date: Sat Sep 17 22:34:33 2011
New Revision: 1172091

URL: http://svn.apache.org/viewvc?rev=1172091&view=rev
Log:
mingwport35: i#117795: MinGW port fix for vcl2gnumake

# HG changeset patch
# User tono@openoffice.org
# Date 1302529511 -32400
# Node ID 5289cfd4bbf8db759d425b40c8f815b12586bdee
# Parent 09e719790284e677e78e9b66250ebbc2e19f2a36

Modified:
    incubator/ooo/trunk/main/RepositoryFixes.mk
    incubator/ooo/trunk/main/solenv/gbuild/platform/winmingw.mk
    incubator/ooo/trunk/main/vcl/Library_vcl.mk
    incubator/ooo/trunk/main/vcl/win/source/gdi/winlayout.cxx

Modified: incubator/ooo/trunk/main/RepositoryFixes.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/RepositoryFixes.mk?rev=1172091&r1=1172090&r2=1172091&view=diff
==============================================================================
--- incubator/ooo/trunk/main/RepositoryFixes.mk (original)
+++ incubator/ooo/trunk/main/RepositoryFixes.mk Sat Sep 17 22:34:33 2011
@@ -84,6 +84,7 @@ else
 gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES))
 endif
 gb_Library_NOILIBFILENAMES:=\
+	icule \
 	icuuc \
 	sot \
 	uwinapi \
@@ -92,6 +93,7 @@ gb_Library_FILENAMES := $(filter-out $(f
 gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
 
 gb_Library_ILIBFILENAMES:=\
+	gdiplus \
 	unicows \
 	uuid \
 
@@ -160,7 +162,9 @@ gb_Library_FILENAMES := $(patsubst msvcr
 endif
 
 gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst icule:icule%,icule:icule40%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst jvmaccess:jvmaccess%,jvmaccess:jvmaccess$(gb_Library_MAJORVER)%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
 

Modified: incubator/ooo/trunk/main/solenv/gbuild/platform/winmingw.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/gbuild/platform/winmingw.mk?rev=1172091&r1=1172090&r2=1172091&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/gbuild/platform/winmingw.mk (original)
+++ incubator/ooo/trunk/main/solenv/gbuild/platform/winmingw.mk Sat Sep 17 22:34:33 2011
@@ -37,6 +37,7 @@ gb_CXX := $(CXX)
 gb_LINK := $(shell $(CC) -print-prog-name=ld)
 gb_AR := $(shell $(CC) -print-prog-name=ar)
 gb_AWK := awk
+gb_RC := rc
 ifeq ($(USE_MINGW),cygwin)
 gb_MINGWLIBDIR := $(COMPATH)/lib/mingw
 else
@@ -70,6 +71,7 @@ endif
 gb_OSDEFS := \
 	-DWINVER=0x0500 \
 	-D_WIN32_IE=0x0500 \
+	-D_WIN32_WINNT=0x0600 \
 	-DNT351 \
 	-DWIN32 \
 	-DWNT \
@@ -99,8 +101,8 @@ gb_CPUDEFS := \
 	-D_M_IX86 \
 
 gb_RCDEFS := \
-     -DWINVER=0x0400 \
-	 -DWIN32 \
+     -DWIN32 \
+     -D__GNUC__ \
 
 gb_RCFLAGS := \
      -V
@@ -396,7 +398,8 @@ $(call gb_Helper_abbreviate_dirs_native,
 	RESPONSEFILE=`$(gb_MKTEMP)` && \
 	echo "$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
 		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) " > $${RESPONSEFILE}
&& \
+		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
+		$(NATIVERES) " > $${RESPONSEFILE} && \
 	$(gb_LINK) \
 		$(gb_Executable_TARGETTYPEFLAGS) \
 		$(LDFLAGS) \
@@ -417,7 +420,8 @@ $(call gb_Helper_abbreviate_dirs_native,
 	RESPONSEFILE=`$(gb_MKTEMP)` && \
 	echo "$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
 		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) " > $${RESPONSEFILE}
&& \
+		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
+		$(NATIVERES) " > $${RESPONSEFILE} && \
 	$(gb_LINK) \
 		$(gb_Library_TARGETTYPEFLAGS) \
 		$(LDFLAGS) \
@@ -470,7 +474,11 @@ gb_Library_PLAINLIBS_NONE += \
 	$(gb_MINGW_LIBGCC) \
 	advapi32 \
 	gdi32 \
+	gdiplus \
+	gnu_getopt \
+	imm32\
 	kernel32 \
+	msimg32 \
 	msvcrt \
 	mpr \
 	moldname \
@@ -481,6 +489,7 @@ gb_Library_PLAINLIBS_NONE += \
 	user32 \
 	uuid \
 	uwinapi \
+	winspool \
 	z \
 
 gb_Library_LAYER := \
@@ -546,9 +555,9 @@ $(call gb_WinResTarget_WinResTarget_init
 $(call gb_WinResTarget_add_file,$(1)/$(2),solenv/inc/shlinfo)
 $(call gb_WinResTarget_set_defs,$(1)/$(2),\
         $$(DEFS) \
-		-DADDITIONAL_VERINFO1 \
-		-DADDITIONAL_VERINFO2 \
-		-DADDITIONAL_VERINFO3 \
+		-DADDITIONAL_VERINFO1= \
+		-DADDITIONAL_VERINFO2= \
+		-DADDITIONAL_VERINFO3= \
 )
 $(call gb_Library_add_nativeres,$(1),$(2))
 $(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(1)/$(2))
@@ -653,7 +662,8 @@ $(call gb_Helper_abbreviate_dirs_native,
 		$(INCLUDE) \
 		-Fo$(patsubst %_res.o,%.res,$(1)) \
         $(RCFILE) )
-    windres $(patsubst %_res.o,%.res,$(1)) $(1)
+$(call gb_Helper_abbreviate_dirs_native,\
+    windres $(patsubst %_res.o,%.res,$(1)) $(1))
 	rm $(patsubst %_res.o,%.res,$(1))
 endef
 

Modified: incubator/ooo/trunk/main/vcl/Library_vcl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/Library_vcl.mk?rev=1172091&r1=1172090&r2=1172091&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/Library_vcl.mk (original)
+++ incubator/ooo/trunk/main/vcl/Library_vcl.mk Sat Sep 17 22:34:33 2011
@@ -497,26 +497,25 @@ $(eval $(call gb_Library_set_ldflags,vcl
 endif
 
 ifeq ($(OS),WNT)
+ifeq ($(USE_MINGW),)
 $(eval $(call gb_Library_set_ldflags,vcl,\
     $$(LDFLAGS) \
     /ENTRY:LibMain@12 \
 ))
+endif
 $(eval $(call gb_Library_add_linked_libs,vcl,\
 	advapi32 \
 	gdi32 \
 	gdiplus \
 	imm32 \
-	kernel32 \
 	mpr \
 	msimg32 \
-	msvcrt \
-	oldnames \
 	ole32 \
 	shell32 \
 	user32 \
 	uuid \
-	uwinapi \
 	winspool \
+	$(gb_STDLIBS) \
 ))
 endif
 # vim: set noet sw=4 ts=4:

Modified: incubator/ooo/trunk/main/vcl/win/source/gdi/winlayout.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/win/source/gdi/winlayout.cxx?rev=1172091&r1=1172090&r2=1172091&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/win/source/gdi/winlayout.cxx (original)
+++ incubator/ooo/trunk/main/vcl/win/source/gdi/winlayout.cxx Sat Sep 17 22:34:33 2011
@@ -2803,7 +2803,7 @@ private:
     grutils::GrFeatureParser * mpFeatures;
     mutable GraphiteLayoutWinImpl maImpl;
 public:
-    GraphiteWinLayout(HDC hDC, const ImplWinFontData& rWFD, ImplWinFontEntry& rWFE);
+    GraphiteWinLayout(HDC hDC, const ImplWinFontData& rWFD, ImplWinFontEntry& rWFE)
throw();
 
     static bool IsGraphiteEnabledFont(HDC hDC) throw();
 



Mime
View raw message