diff --git a/processing/build/windows/make.sh b/processing/build/windows/make.sh index c89b222cd..731a56e7c 100755 --- a/processing/build/windows/make.sh +++ b/processing/build/windows/make.sh @@ -58,6 +58,9 @@ fi cd bagel +# clear jikespath to avoid problems if it is defined elsewhere +unset JIKESPATH + if test -d /cygdrive/c/WINNT then # windows 2000 or nt @@ -71,15 +74,14 @@ fi CLASSPATH=../build/windows/work/java/lib/rt.jar:../build/windows/work/java/lib/ext/comm.jar:${QT_JAVA_PATH} - ### --- make version with serial for the application -echo Building bagel with serial and video support -perl make.pl SERIAL VIDEO +echo Building bagel with serial, sonic and video support +perl make.pl SERIAL SONIC VIDEO cp classes/*.class ../build/windows/work/classes/ ### --- make version without serial for applet exporting -echo Building bagel for export -perl make.pl +echo Building bagel for export with sonic support +perl make.pl SONIC cp classes/*.class ../build/windows/work/lib/export/ cd .. diff --git a/processing/build/windows/run.sh b/processing/build/windows/run.sh index 9c1c844fc..f814a7913 100644 --- a/processing/build/windows/run.sh +++ b/processing/build/windows/run.sh @@ -3,12 +3,15 @@ if test -d /cygdrive/c/WINNT then # windows 2000 or nt - QT_JAVA_PATH=\\cygdrive\\c\\WINNT\\system32\\QTJava.zip + QT_JAVA_PATH=C:\\WINNT\\system32\\QTJava.zip else # other versions of windows, including xp - QT_JAVA_PATH=\\cygdrive\\c\\WINDOWS\\system32\\QTJava.zip + QT_JAVA_PATH=C:\\WINDOWS\\system32\\QTJava.zip fi # another alternative #QT_JAVA_PATH=..\\build\\shared\\lib\\qtjava.zip -cd work && ./java/bin/java -cp lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\oro.jar\;java\\lib\\ext\\comm.jar\;${QT_JAVA_PATH} PdeBase + +CLASSPATH=lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\oro.jar\;java\\lib\\ext\\comm.jar\;${QT_JAVA_PATH} + +cd work && ./java/bin/java -cp ${CLASSPATH} PdeBase