Test building openal-soft w/ Windows/cmake - fails ..

3 files changed, 23 insertions, 8 deletions

diff --git a/make/build.xml b/make/build.xml
index 673c5f6..69aa72d 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -445,6 +445,7 @@
     </target>
 
     <target name="c.build.openal.soft.android" if="isAndroid">
+      <property name="c.build.openal.soft.done" value="true" />
       <mkdir dir="${build}/openal-soft" />
       <exec dir="${build}/openal-soft" executable="cmake" logError="true" failonerror="false" failifexecutionfails="false">
         <env key="PATH" value="${env.PATH_VANILLA}"/>
@@ -457,7 +458,18 @@
       <exec dir="${build}/openal-soft" executable="make" logError="true" failonerror="false" failifexecutionfails="false" />
     </target>
 
-    <target name="c.build.openal.soft.default" unless="isAndroid">
+    <target name="c.build.openal.soft.windows" if="isWindows">
+      <property name="c.build.openal.soft.done" value="true" />
+      <mkdir dir="${build}/openal-soft" />
+      <exec dir="${build}/openal-soft" executable="cmake" logError="true" failonerror="false" failifexecutionfails="false">
+        <env key="PATH" value="${env.PATH}"/>
+        <arg value="../../openal-soft"/>
+        <arg value="-DCMAKE_TOOLCHAIN_FILE=../../openal-soft/cmake/toolchain.windows.cmake"/>
+      </exec>
+      <exec dir="${build}/openal-soft" executable="make" logError="true" failonerror="false" failifexecutionfails="false" />
+    </target>
+
+    <target name="c.build.openal.soft.default" unless="c.build.openal.soft.done">
       <mkdir dir="${build}/openal-soft" />
       <exec dir="${build}/openal-soft" executable="cmake" logError="true" failonerror="false" failifexecutionfails="false">
         <arg value="../../openal-soft"/>
@@ -466,7 +478,7 @@
     </target>
 
     <target name="c.build.openal.soft" 
-            depends="init, gluegen.cpptasks.detect.os, gluegen.cpptasks.setup.compiler, c.build.openal.soft.default, c.build.openal.soft.android">
+            depends="init, gluegen.cpptasks.detect.os, gluegen.cpptasks.setup.compiler, c.build.openal.soft.windows, c.build.openal.soft.android, c.build.openal.soft.default">
         <copy todir="../${rootrel.build}/obj" failonerror="false">
             <fileset dir="${build}/openal-soft" erroronmissingdir="false">
               <include name="*openal.${native.library.suffix}" />
diff --git a/make/scripts/make.joal.all.win32.bat b/make/scripts/make.joal.all.win32.bat
index 1a769ce..48a5110 100755
--- a/make/scripts/make.joal.all.win32.bat
+++ b/make/scripts/make.joal.all.win32.bat
@@ -1,10 +1,11 @@
 set THISDIR="C:\JOGL"

 

-set J2RE_HOME=c:\jre1.6.0_30_x32

-set JAVA_HOME=c:\jdk1.6.0_30_x32

+set J2RE_HOME=c:\jre1.6.0_35_x32

+set JAVA_HOME=c:\jdk1.6.0_35_x32

 set ANT_PATH=C:\apache-ant-1.8.2

+set CMAKE_PATH=C:\cmake-2.8.10.2-win32-x86

 

-set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%

+set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%CMAKE_PATH%\bin;%PATH%

 

 set LIB_GEN=%THISDIR%\lib

 set CLASSPATH=.;%THISDIR%\build-win32\classes

diff --git a/make/scripts/make.joal.all.win64.bat b/make/scripts/make.joal.all.win64.bat
index 1d1b915..4caaad7 100755
--- a/make/scripts/make.joal.all.win64.bat
+++ b/make/scripts/make.joal.all.win64.bat
@@ -1,10 +1,12 @@
 set THISDIR="C:\JOGL"

 

-set J2RE_HOME=c:\jre1.6.0_30_x64

-set JAVA_HOME=c:\jdk1.6.0_30_x64

+set J2RE_HOME=c:\jre1.6.0_35_x64

+set JAVA_HOME=c:\jdk1.6.0_35_x64

 set ANT_PATH=C:\apache-ant-1.8.2

+set CMAKE_PATH=C:\cmake-2.8.10.2-win32-x86

+set CMAKE_C_COMPILER=c:\mingw64\bin\gcc

 

-set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;c:\mingw\bin;%PATH%

+set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;c:\mingw\bin;%CMAKE_PATH%\bin;%PATH%

 

 set LIB_GEN=%THISDIR%\lib

 set CLASSPATH=.;%THISDIR%\build-win64\classes