Author: pfg
Date: Wed Nov 25 21:52:49 2015
New Revision: 1716551
URL: http://svn.apache.org/viewvc?rev=1716551&view=rev
Log:
i126615 - Allow build of Open Office on FreeBSD Mac PowerPCG5
These appear to have been missed from r1608245.
Brave attempt by: Curtis Hamilton
Modified:
openoffice/trunk/main/bridges/prj/build.lst
openoffice/trunk/main/desktop/source/deployment/misc/dp_platform.cxx
Modified: openoffice/trunk/main/bridges/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/prj/build.lst?rev=1716551&r1=1716550&r2=1716551&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/prj/build.lst (original)
+++ openoffice/trunk/main/bridges/prj/build.lst Wed Nov 25 21:52:49 2015
@@ -9,6 +9,8 @@ br bridges\source\cpp_uno\gcc3_os2_intel
br bridges\source\cpp_uno\gcc3_freebsd_intel nmake - u
br_gcc3fi br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\gcc3_linux_x86-64 nmake - u
br_gcc3lx br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\gcc3_freebsd_x86-64 nmake - u
br_gcc3fx br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\gcc3_freebsd_powerpc nmake - u
br_gcc3fp br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\gcc3_freebsd_powerpc64 nmake - u
br_gcc3fp_64 br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\gcc3_linux_powerpc nmake - u
br_gcc3lp br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\gcc3_linux_powerpc64 nmake - u
br_gcc3lp_64 br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\gcc3_linux_mips nmake - u
br_gcc3lmips br_cppuno_shared br_unotypes br_inc NULL
Modified: openoffice/trunk/main/desktop/source/deployment/misc/dp_platform.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/source/deployment/misc/dp_platform.cxx?rev=1716551&r1=1716550&r2=1716551&view=diff
==============================================================================
--- openoffice/trunk/main/desktop/source/deployment/misc/dp_platform.cxx
(original)
+++ openoffice/trunk/main/desktop/source/deployment/misc/dp_platform.cxx Wed
Nov 25 21:52:49 2015
@@ -56,6 +56,7 @@
#define PLATFORM_SOLARIS_SPARC "solaris_sparc"
#define PLATFORM_SOLARIS_SPARC64 "solaris_sparc64"
#define PLATFORM_SOLARIS_X86 "solaris_x86"
+#define PLATFORM_FREEBSD_POWERPC "freebsd_powerpc"
#define PLATFORM_FREEBSD_X86 "freebsd_x86"
#define PLATFORM_FREEBSD_X86_64 "freebsd_x86_64"
#define PLATFORM_MACOSX_X86 "macosx_x86"
@@ -164,6 +165,8 @@ namespace
ret = checkOSandCPU(OUSTR("Solaris"), OUSTR("SPARC64"));
else if (token.equals(OUSTR(PLATFORM_SOLARIS_X86)))
ret = checkOSandCPU(OUSTR("Solaris"), OUSTR("x86"));
+ else if (token.equals(OUSTR(PLATFORM_FREEBSD_POWERPC)))
+ ret = checkOSandCPU(OUSTR("FreeBSD"), OUSTR("PowerPC"));
else if (token.equals(OUSTR(PLATFORM_FREEBSD_X86)))
ret = checkOSandCPU(OUSTR("FreeBSD"), OUSTR("x86"));
else if (token.equals(OUSTR(PLATFORM_FREEBSD_X86_64)))
