harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndbe...@apache.org
Subject svn commit: r640300 - in /harmony/enhanced/classlib/trunk: depends/build/platform/macosx.x86.mk make/properties.xml
Date Mon, 24 Mar 2008 03:34:05 GMT
Author: ndbeyer
Date: Sun Mar 23 20:34:04 2008
New Revision: 640300

URL: http://svn.apache.org/viewvc?rev=640300&view=rev
Log:
First attempt at a Mac OS X x86 platform-specific make file
Adjust properties.xml for macosx to look in '/opt/local'; the default for macports.org

Added:
    harmony/enhanced/classlib/trunk/depends/build/platform/macosx.x86.mk
Modified:
    harmony/enhanced/classlib/trunk/make/properties.xml

Added: harmony/enhanced/classlib/trunk/depends/build/platform/macosx.x86.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/macosx.x86.mk?rev=640300&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/macosx.x86.mk (added)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/macosx.x86.mk Sun Mar 23 20:34:04
2008
@@ -0,0 +1,27 @@
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+DEFINES += -DMACOSX -DMACOSX_X86 -DHYX86 -DIPv6_FUNCTION_SUPPORT
+OPT += -fPIC -fno-common
+OSLIBS = -lc -lm -ldl -liconv
+XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXtst -lXrender -lexpat \
+        -L/sw/lib/freetype2/lib -lfreetype -lfontconfig
+MDLLIBPREFIX =
+MDLLIBSUFFIX =
+EXERPATHPREFIX = 
+DLL_LD = $(CC)
+DLL_LDFLAGS = -dynamiclib -dynamic -install_name $(@F)
+
+RANLIB=ranlib

Modified: harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?rev=640300&r1=640299&r2=640300&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ harmony/enhanced/classlib/trunk/make/properties.xml Sun Mar 23 20:34:04 2008
@@ -252,7 +252,7 @@
     <condition property="png.home" value="/usr/local">
         <isset property="is.freebsd"/>
     </condition>
-    <condition property="png.home" value="/sw">
+    <condition property="png.home" value="/opt/local">
         <isset property="is.macosx"/>
     </condition>
     <property name="png.home" value="/usr" />
@@ -260,7 +260,7 @@
     <condition property="lcms.home" value="/usr/local">
         <isset property="is.freebsd"/>
     </condition>
-    <condition property="lcms.home" value="/sw">
+    <condition property="lcms.home" value="/opt/local">
         <isset property="is.macosx"/>
     </condition>
     <property name="lcms.home" value="/usr" />
@@ -268,7 +268,7 @@
     <condition property="jpeg.home" value="/usr/local">
         <isset property="is.freebsd"/>
     </condition>
-    <condition property="jpeg.home" value="/sw">
+    <condition property="jpeg.home" value="/opt/local">
         <isset property="is.macosx"/>
     </condition>
     <property name="jpeg.home" value="/usr" />



Mime
View raw message