michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updates for building windows 64 bit builds in VC express

This commit is contained in:
Jeremy Booth 2009-04-08 20:18:29 +00:00
parent 175eb088c6
commit 18e1db9336
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.xml
View File

@ -270,7 +270,9 @@
<!-- Compiles LWJGL on Win32 platforms -->
<target name="-compile_native_win32" if="lwjgl.platform.windows">
<ant antfile="platform_build/windows_ant/build.xml" inheritAll="false"/>
<copy file="${lwjgl.bin}/lwjgl/lwjgl.dll" todir="${lwjgl.lib}/windows"/>
<copy todir="${lwjgl.lib}/windows">
<fileset dir="${lwjgl.bin}/lwjgl" includes="lwjgl*.dll"/>
</copy>
</target>
<!-- Compiles LWJGL on Linux platforms -->

16
platform_build/windows_ant/build.xml
View File

@ -4,15 +4,11 @@
<property name="native" location="../../src/native"/>
<property environment="env"/>
<property name="sdkhome" location="${env.MSSDK}"/>
<property name="program_files" location="${env.ProgramFiles}"/>
<property name="alhome" location="${program_files}\OpenAL 1.1 with EFX SDK"/>
<property name="dllname" value="lwjgl.dll"/>
<target name="compile_dir">
<apply dir="." failonerror="true" executable="cl" dest="." skipemptyfilesets="true">
<arg line="/Ox /W2 /nologo /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c"/>
<arg value="/I${sdkhome}\include"/>
<arg value="/I${alhome}\include"/>
<arg value="/I${java.home}\..\include"/>
<arg value="/I${java.home}\..\include\win32"/>
<arg value="/I${native}\common"/>
@ -31,8 +27,7 @@
<srcfile/>
<arg line="/Fe${dllname} /link"/>
<arg value="/LIBPATH:${java.home}\..\lib"/>
<arg value="/LIBPATH:${sdkhome}\lib"/>
<arg value="/LIBPATH:${alhome}\libs"/>
<arg value="/LIBPATH:${sdkhomelib}"/>
<arg value="/OPT:REF"/>
<arg value="/OPT:ICF"/>
<arg line="/DLL /DELAYLOAD:jawt.dll ${libs}"/>
@ -50,8 +45,13 @@
</target>
<target name="compile">
<echo message="${sdkhome}"/>
<echo message="${program_files}"/>
<condition property="sdkhomelib" value="${sdkhome}\lib" else="${sdkhome}\lib\x64">
<equals arg1="${os.arch}" arg2="x86"/>
</condition>
<condition property="dllname" value="lwjgl.dll" else="lwjgl64.dll">
<equals arg1="${os.arch}" arg2="x86"/>
</condition>
<echo message="${sdkhomelib}"/>
<property name="libs" value="Kernel32.lib ole32.lib OpenGL32.Lib Version.lib user32.lib Gdi32.lib Advapi32.lib jawt.lib delayimp.lib winmm.lib"/>
<antcall target="compile_dir"/>
<antcall target="link"/>