openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yda...@apache.org
Subject svn commit: r1536083 - in /openoffice/trunk/main: set_soenv.in solenv/gbuild/platform/os2.mk solenv/inc/os2gcci.mk tools/source/generic/toolsin.cxx vcl/os2/source/gdi/salgdi3.cxx
Date Sun, 27 Oct 2013 10:33:57 GMT
Author: ydario
Date: Sun Oct 27 10:33:57 2013
New Revision: 1536083

URL: http://svn.apache.org/r1536083
Log:
i118923 - OS/2 port: build system updates.

Modified:
    openoffice/trunk/main/set_soenv.in
    openoffice/trunk/main/solenv/gbuild/platform/os2.mk
    openoffice/trunk/main/solenv/inc/os2gcci.mk
    openoffice/trunk/main/tools/source/generic/toolsin.cxx
    openoffice/trunk/main/vcl/os2/source/gdi/salgdi3.cxx

Modified: openoffice/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/set_soenv.in?rev=1536083&r1=1536082&r2=1536083&view=diff
==============================================================================
--- openoffice/trunk/main/set_soenv.in (original)
+++ openoffice/trunk/main/set_soenv.in Sun Oct 27 10:33:57 2013
@@ -991,6 +991,12 @@ $PERL_PATH            = dirname('@PERL@'
 $XLIB                 = PathFormat('@XLIB@'); # X11 libraries
 $XINC                 = PathFormat('@XINC@'); # X11 includes
 
+# YD disable autodetection, use PATH
+if ( $platform =~ m/os2/ )
+{
+   $PERL = 'perl';
+   $PERL_PATH = '';
+}
 
 # Mac OS X/Darwin only variables.
 if ( $platform =~ m/darwin/ )
@@ -2080,6 +2086,7 @@ if ( $platform =~ m/os2/ )
    ToFile( "LS",                "ls.exe",           "e" );
    ToFile( "GNUCOPY",           "cp.exe",           "e" );
    ToFile( "TOUCH",             "touch",            "e" );
+   ToFile( "CONFIG_SITE",       "/@unixroot/usr/share/config.site", "e" );
 }
 
 # $perlpre is only used for the following three variables

Modified: openoffice/trunk/main/solenv/gbuild/platform/os2.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/os2.mk?rev=1536083&r1=1536082&r2=1536083&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/os2.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/os2.mk Sun Oct 27 10:33:57 2013
@@ -87,10 +87,6 @@ gb_CFLAGS := \
 	-I$(JAVA_HOME)/include \
 	-I$(JAVA_HOME)/include/os2
 
-
-#	-fvisibility=hidden \
-#
-
 gb_CXXFLAGS := \
 	-Zomf \
 	-Wall \
@@ -108,7 +104,7 @@ gb_CXXFLAGS := \
 
 gb_STDLIBS = \
 	z \
-	stdc++ \
+	stdc++
 
 ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
 gb_CFLAGS_WERROR := -Werror

Modified: openoffice/trunk/main/solenv/inc/os2gcci.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/os2gcci.mk?rev=1536083&r1=1536082&r2=1536083&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/os2gcci.mk (original)
+++ openoffice/trunk/main/solenv/inc/os2gcci.mk Sun Oct 27 10:33:57 2013
@@ -259,8 +259,8 @@ STDLIBGUIST=$(STDLIBCPP)
 STDSHLGUIMT=$(STDLIBCPP)
 STDSHLCUIMT=$(STDLIBCPP)
 
-LIBSTLPORT=stlp45.lib $(DYNAMIC) 
-LIBSTLPORTST=stlp45.lib $(STATIC) $(DYNAMIC)
+LIBSTLPORT=$(DYNAMIC) 
+LIBSTLPORTST=$(STATIC) $(DYNAMIC)
 
 
 # name of library manager

Modified: openoffice/trunk/main/tools/source/generic/toolsin.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/tools/source/generic/toolsin.cxx?rev=1536083&r1=1536082&r2=1536083&view=diff
==============================================================================
--- openoffice/trunk/main/tools/source/generic/toolsin.cxx (original)
+++ openoffice/trunk/main/tools/source/generic/toolsin.cxx Sun Oct 27 10:33:57 2013
@@ -31,7 +31,7 @@
 #include <tools/debug.hxx>
 #include <toolsin.hxx>
 
-#if defined WNT || defined OS2
+#if defined WNT
 #include <dll.hxx>
 #endif
 

Modified: openoffice/trunk/main/vcl/os2/source/gdi/salgdi3.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/os2/source/gdi/salgdi3.cxx?rev=1536083&r1=1536082&r2=1536083&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/os2/source/gdi/salgdi3.cxx (original)
+++ openoffice/trunk/main/vcl/os2/source/gdi/salgdi3.cxx Sun Oct 27 10:33:57 2013
@@ -837,7 +837,7 @@ USHORT Os2SalGraphics::SetFont( ImplFont
         return 0;
     }
 
-#if OSL_DEBUG_LEVEL>1
+#if OSL_DEBUG_LEVEL>10
     debug_printf( "Os2SalGraphics::SetFont\n");
 #endif
 



Mime
View raw message