[Java-game-lib-cvs] SF.net SVN: java-game-lib: [2457] trunk/LWJGL

[<eli...@us...>]

Revision: 2457
Author:   elias_naur
Date:     2006-07-08 10:20:18 -0700 (Sat, 08 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2457&view=rev

Log Message:
-----------
Windows: Added ant build.xml for native core

Modified Paths:
--------------
    trunk/LWJGL/build.xml

Added Paths:
-----------
    trunk/LWJGL/platform_build/windows_ant/
    trunk/LWJGL/platform_build/windows_ant/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2006-07-07 14:06:46 UTC (rev 2456)
+++ trunk/LWJGL/build.xml	2006-07-08 17:20:18 UTC (rev 2457)
@@ -654,6 +654,11 @@
 
 	<target name="compile_native_optional" depends="headers" description="Compiles the native files">
 		<!-- check each platform, and run their build target -->
+		<condition property="lwjgl.platform.windows">
+			<os family="windows" />
+		</condition>
+		<antcall target="-compile_native_win32_optional" />
+
 		<condition property="lwjgl.platform.linux">
 			<os name="Linux" />
 		</condition>
@@ -670,15 +675,20 @@
 		<echo>Compiling Win32 LWJGL version</echo>
 		
 		<!-- check for required properties -->
-		<property environment="env"/>
+		<!--		<property environment="env"/>
 		<fail message="Missing PLTSDKHOME path environment property" unless="env.PLTSDKHOME"/>
 		<fail message="Missing ALHOME path environment property" unless="env.ALHOME"/>
 		<fail message="Missing JAVA_HOME path environment property" unless="env.JAVA_HOME"/>
 		<fail message="Missing CHOME path environment property" unless="env.CHOME"/>
 		<fail message="Missing DXHOME path environment property" unless="env.DXHOME"/>
+		
+		<antcall target="-compile_native_win32_main" />-->
+		<ant antfile="platform_build/windows_ant/build.xml" inheritAll="false"/>
+		<copy file="${lwjgl.bin}/lwjgl.dll" todir="${lwjgl.lib}/win32"/>
+	</target>
+
+	<target name="-compile_native_win32_optional" if="lwjgl.platform.windows">
 		<fail message="Missing FMODHOME path environment property" unless="env.FMODHOME"/>
-		
-		<antcall target="-compile_native_win32_main" />
 		<antcall target="-compile_native_win32_fmod" />
 		<antcall target="-compile_native_win32_devil" />
 	</target>	

Added: trunk/LWJGL/platform_build/windows_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/windows_ant/build.xml	                        (rev 0)
+++ trunk/LWJGL/platform_build/windows_ant/build.xml	2006-07-08 17:20:18 UTC (rev 2457)
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+
+<project name="lwjgl native code, native code" basedir="../../bin" default="compile">
+	<property name="native" location="../src/native"/>
+
+	<target name="compile_dir">
+		<apply dir="." failonerror="true" executable="cl" dest="." skipemptyfilesets="true">
+			<arg line="/Ox /Wp64 /W2 /nologo /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c /D WIN32 /c"/>
+			<arg value="/I${toolkithome}\include"/>
+			<arg value="/I${sdkhome}\include"/>
+			<arg value="/I${dxhome}\include"/>
+			<arg value="/I${alhome}\include"/>
+			<arg value="/I${java.home}\..\include"/>
+			<arg value="/I${java.home}\..\include\win32"/>
+			<arg value="/I${native}/common"/>
+			<arg value="/I${native}/win32"/>
+			<srcfile/>
+			<fileset dir="${native}/win32" includes="*.c"/>
+			<fileset dir="${native}/common" includes="*.c"/>
+			<fileset dir="${native}/generated" includes="*.c"/>
+			<mapper type="glob" from="*.c" to="*.obj"/>
+		</apply>
+	</target>
+
+	<target name="link">
+		<apply dir="." parallel="true" executable="cl" failonerror="true">
+			<arg line="/LD /nologo"/>
+			<srcfile/>
+			<arg line="/Fe${dllname} /link"/>
+			<arg value="/LIBPATH:${java.home}\..\lib"/>
+			<arg value="/LIBPATH:${dxhome}\lib\x86"/>
+			<arg value="/LIBPATH:${sdkhome}\lib"/>
+			<arg value="/LIBPATH:${alhome}\libs"/>
+			<arg value="/LIBPATH:${toolkithome}\lib"/>
+			<arg value="/OPT:REF"/>
+			<arg value="/OPT:ICF"/>
+			<arg line="/DLL /DELAYLOAD:jawt.dll ${libs}"/>
+			<fileset dir="." includes="*.obj"/>
+		</apply>
+	</target>
+
+	<target name="clean">
+		<delete>
+			<fileset dir="." includes="*.obj"/>
+			<fileset dir="." includes="*.dll"/>
+		</delete>
+	</target>
+
+	<target name="compile">
+		<property name="program_files" location="c:\Program Files"/>
+		<property name="dxhome" location="${program_files}\Microsoft DirectX SDK (February 2006)"/>
+		<property name="toolkithome" location="${program_files}\Microsoft Visual C++ Toolkit 2003"/>
+		<property name="sdkhome" location="${program_files}\Microsoft Platform SDK"/>
+		<property name="alhome" location="${program_files}\OpenAL 1.0 Software Development Kit"/>
+		<property name="dllname" value="lwjgl.dll"/>
+		<property name="libs" value="Kernel32.lib ole32.lib dinput.lib dxguid.lib OpenGL32.Lib Version.lib user32.lib Gdi32.lib Advapi32.lib jawt.lib delayimp.lib winmm.lib"/>
+		<antcall target="compile_dir"/>
+		<antcall target="link"/>
+    </target>
+</project>
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.