incubator-kato-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spo...@apache.org
Subject svn commit: r820205 - in /incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi: pom.xml win32/pom.xml
Date Wed, 30 Sep 2009 08:04:07 GMT
Author: spoole
Date: Wed Sep 30 08:04:07 2009
New Revision: 820205

URL: http://svn.apache.org/viewvc?rev=820205&view=rev
Log:
experimental change to win build for vmapi to get it to build on amd64

Modified:
    incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/pom.xml
    incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/win32/pom.xml

Modified: incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/pom.xml?rev=820205&r1=820204&r2=820205&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/pom.xml Wed Sep 30
08:04:07 2009
@@ -37,6 +37,10 @@
           <arch>x86</arch>
         </os>
       </activation>
+       <properties>
+      	<javah.os>win32</javah.os>
+      	<machine.linker></machine.linker>
+      </properties>
       <modules>
       	<module>javah</module>
         <module>win32</module>
@@ -52,6 +56,10 @@
           <arch>amd64</arch>
         </os>
       </activation>
+       <properties>
+      	<javah.os>win64</javah.os>
+      	<machine.linker>/machine:AMD64</machine.linker>
+      </properties>
       <modules>
       	<module>javah</module>
         <module>win32</module>

Modified: incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/win32/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/win32/pom.xml?rev=820205&r1=820204&r2=820205&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/win32/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/win32/pom.xml Wed Sep
30 08:04:07 2009
@@ -34,7 +34,7 @@
             <compilerStartOption>/LD /D "WIN32"  /DBUILD_DLL</compilerStartOption>
           </compilerStartOptions>
           
-          <javahOS>win32</javahOS>
+          <javahOS>${javah.os}</javahOS>
           
           <sources>
             <source>
@@ -51,7 +51,7 @@
             
           
           <linkerStartOptions>
-            <linkerStartOption>/DLL</linkerStartOption>
+            <linkerStartOption>/DLL ${machine.linker} /linkerStartOption>
           </linkerStartOptions>
           
           



Mime
View raw message