java-game-lib-cvs

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3155] trunk/LWJGL/platform_build/mingw_ant/build .xml

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

Revision: 3155
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3155&view=rev
Author:   elias_naur
Date:     2008-11-24 10:06:29 +0000 (Mon, 24 Nov 2008)

Log Message:
-----------
Removed dinput references from mingw build.xml

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

Modified: trunk/LWJGL/platform_build/mingw_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/mingw_ant/build.xml	2008-11-23 13:08:41 UTC (rev 3154)
+++ trunk/LWJGL/platform_build/mingw_ant/build.xml	2008-11-24 10:06:29 UTC (rev 3155)
@@ -48,7 +48,7 @@
 	</target>
 	
 	<target name="compile">
-		<property name="libs" value="-lKernel32 -lole32 -ldinput -ldxguid -lOpenGL32 -lVersion -luser32 -lGdi32 -lAdvapi32 -ljawt -lwinmm"/>
+		<property name="libs" value="-lKernel32 -lole32 -lOpenGL32 -lVersion -luser32 -lGdi32 -lAdvapi32 -ljawt -lwinmm"/>
 		<antcall target="compile_dir"/>
 		<antcall target="link"/>
 		<apply dir="." executable="${strip}">


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3168] trunk/LWJGL/platform_build/mingw_ant/build .xml

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

Revision: 3168
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3168&view=rev
Author:   elias_naur
Date:     2008-12-22 16:47:35 +0000 (Mon, 22 Dec 2008)

Log Message:
-----------
Support win64 build from mingw_ant/build.xml

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

Modified: trunk/LWJGL/platform_build/mingw_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/mingw_ant/build.xml	2008-12-22 16:38:57 UTC (rev 3167)
+++ trunk/LWJGL/platform_build/mingw_ant/build.xml	2008-12-22 16:47:35 UTC (rev 3168)
@@ -3,21 +3,19 @@
 <project name="lwjgl native code, native code" basedir="../../bin/lwjgl" default="compile">
 	<property name="native" location="../../src/native"/>
 	<property environment="env"/>
-	<property name="dxhome" location="${env.DXSDK_DIR}"/>
-	<property name="program_files" location="${env.ProgramFiles}"/>
-	<property name="alhome" location="${program_files}\OpenAL 1.1 with EFX SDK"/>
-	<property name="chome" location="c:/MinGW"/>
-	<property name="gcc" location="${chome}/bin/gcc"/>
-	<property name="strip" location="${chome}/bin/strip"/>
-	<property name="dllname" value="lwjgl.dll"/>
+	<property name="mingwhome" location="c:/MinGW64"/>
+	<property name="strip" location="${mingwhome}/bin/x86_64-pc-mingw32-strip"/>
+	<property name="gcc" location="${mingwhome}/bin/x86_64-pc-mingw32-gcc"/>
+	<property name="dlltool" location="${mingwhome}/bin/x86_64-pc-mingw32-dlltool"/>
+	<property name="dllname" value="lwjgl64.dll"/>
 
 	<target name="compile_dir">
 		<apply dir="." failonerror="true" executable="${gcc}" dest="." skipemptyfilesets="true">
-			<arg line="-c -Wall -O2 -std=gnu99"/>
+			<arg line="-c -Wall -O2 -std=gnu99 -D_JNI_IMPLEMENTATION_"/>
 			<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${jdkhome}/../include"/>
+			<arg value="-I${jdkhome}/../include/win32"/>
 			<arg value="-I${native}/common"/>
 			<arg value="-I${native}/windows"/>
 			<srcfile/>
@@ -29,10 +27,18 @@
 	</target>
 
 	<target name="link">
+		<echo file="jawt.def">
+			EXPORTS
+			 JAWT_GetAWT
+		</echo>
+		<exec dir="." executable="${dlltool}" failonerror="true">
+			<arg line="--def jawt.def --kill-at --dllname jawt.dll --output-lib libjawt.a"/>
+		</exec>
 		<apply dir="." parallel="true" executable="${gcc}" failonerror="true">
 			<arg value="-Wl,--kill-at"/>
 			<arg line="-shared -o ${dllname}"/>
 			<srcfile/>
+			<arg line="libjawt.a"/>
 			<arg value="-L${java.home}/../lib"/>
 			<arg value="-L${alhome}/libs"/>
 			<arg line="${libs}"/>
@@ -48,7 +54,7 @@
 	</target>
 	
 	<target name="compile">
-		<property name="libs" value="-lKernel32 -lole32 -lOpenGL32 -lVersion -luser32 -lGdi32 -lAdvapi32 -ljawt -lwinmm"/>
+		<property name="libs" value="-lkernel32 -lole32 -lopengl32 -lversion -luser32 -lgdi32 -ladvapi32 -lwinmm"/>
 		<antcall target="compile_dir"/>
 		<antcall target="link"/>
 		<apply dir="." executable="${strip}">


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3169] trunk/LWJGL/platform_build/mingw_ant/build .xml

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

Revision: 3169
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3169&view=rev
Author:   elias_naur
Date:     2008-12-22 16:50:00 +0000 (Mon, 22 Dec 2008)

Log Message:
-----------
mingw_ant/build.xml improvements

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

Modified: trunk/LWJGL/platform_build/mingw_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/mingw_ant/build.xml	2008-12-22 16:47:35 UTC (rev 3168)
+++ trunk/LWJGL/platform_build/mingw_ant/build.xml	2008-12-22 16:50:00 UTC (rev 3169)
@@ -3,10 +3,11 @@
 <project name="lwjgl native code, native code" basedir="../../bin/lwjgl" default="compile">
 	<property name="native" location="../../src/native"/>
 	<property environment="env"/>
+	<property name="mingwprefix" location="x86_64-pc-mingw32-"/>
 	<property name="mingwhome" location="c:/MinGW64"/>
-	<property name="strip" location="${mingwhome}/bin/x86_64-pc-mingw32-strip"/>
-	<property name="gcc" location="${mingwhome}/bin/x86_64-pc-mingw32-gcc"/>
-	<property name="dlltool" location="${mingwhome}/bin/x86_64-pc-mingw32-dlltool"/>
+	<property name="strip" location="${mingwhome}/${mingwprefix}strip"/>
+	<property name="gcc" location="${mingwhome}/${mingwprefix}gcc"/>
+	<property name="dlltool" location="${mingwhome}/${mingwprefix}dlltool"/>
 	<property name="dllname" value="lwjgl64.dll"/>
 
 	<target name="compile_dir">


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3170] trunk/LWJGL/platform_build/mingw_ant/build .xml

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

Revision: 3170
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3170&view=rev
Author:   elias_naur
Date:     2008-12-22 16:51:26 +0000 (Mon, 22 Dec 2008)

Log Message:
-----------
jdkhome should be a jdk path, not a jre path

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

Modified: trunk/LWJGL/platform_build/mingw_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/mingw_ant/build.xml	2008-12-22 16:50:00 UTC (rev 3169)
+++ trunk/LWJGL/platform_build/mingw_ant/build.xml	2008-12-22 16:51:26 UTC (rev 3170)
@@ -15,8 +15,8 @@
 			<arg line="-c -Wall -O2 -std=gnu99 -D_JNI_IMPLEMENTATION_"/>
 			<arg value="-I${dxhome}/include"/>
 			<arg value="-I${alhome}/include"/>
-			<arg value="-I${jdkhome}/../include"/>
-			<arg value="-I${jdkhome}/../include/win32"/>
+			<arg value="-I${jdkhome}/include"/>
+			<arg value="-I${jdkhome}/include/win32"/>
 			<arg value="-I${native}/common"/>
 			<arg value="-I${native}/windows"/>
 			<srcfile/>


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