From ac7d31a24b466895addda360054bbe4408ba8154 Mon Sep 17 00:00:00 2001 From: benfry Date: Tue, 5 Apr 2005 00:32:22 +0000 Subject: [PATCH] fixing makefile for windows new libs --- .../build/windows/launcher/processing.exe | Bin 123829 -> 123829 bytes processing/build/windows/make.sh | 18 ++++++++---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/processing/build/windows/launcher/processing.exe b/processing/build/windows/launcher/processing.exe index 0b106d3a5c0832c90c9d7ef86efd1973ae81f87f..70f317c5b09d1e1a17cf6d478f7ba3637c304b27 100755 GIT binary patch delta 5266 zcma)AeNAB0TLyk_rA`uSo3??*t}Sr}!tXHVz)-tw#T3!$ z?(A&Cxw>!L(M^tQS=%Ox3Vxs?qXHHM=%(1IHCJm0|FF$CXx8lSxp!t5g6S~ljPJa^ z-}C)E?|U!qYmeI39_4x^VxTv_&XLBF>fV{DD*H>_`8U~K=>>KxGfQu?hgqX^r~Z~E zt?FA=ogx+uISMq{pNLgA9jfd>hp@0t5Zq7aEOcV2C_KUhL179Ow^w;&M|g6xHCp$Ka!0i(d$P)ebGB9La`!YK3JEYnQh8<3SFkfU=lc7^~2j<_u3Azm)>eeSen3fP+hdnz;vT-5)T^m1gH(M$ew z8yvY>*?VpSx%B{~%A1i{yL2*g9&<_GN2XR^1YUC`_P}FsinP??y(aG>U?;J~&vg8B zs!wzf3oG|yE9P#cPN47JxwQ3==(ErSuLp2Y$TG`yp&FcyMptzNP$K~(kxE;(8_n9{ z7IPQ8R@-aSP|aV5Bn3!zKf`bFBP%eB7RNF2O(j;Kq?rEfQb_6T}|5b7iE79 zN?Es4!d4)Vk)v*q`ZdL>+0oLn=zLX{M*4g7GrH9n?t_bGnS%vMkCJ{K^HBBPNPkEu z$q;_Gbdij|M$H6-7Htp!hCPiu{)xzoA<`m%e(m=@AL5W}vkE}K)K-$d6e3+nfUY_u z)z^X4x~m#aMhN|BK?Y5)`mczm2G6RfEXDo?;ff8?XC(g@r{PM_dC4oUG1)m};{_UrSrq zzBbSrTHk;J11>GJeV*(|x$091Bc~a%(*zgQd$hwFL!%vz@OR9m3ls+{9M)XX)LW%h zarfMBh6hLT9Aw>|qjsmFZaMn;ENsP<)7o?HkRNP0DfM{}YtPZRCetD}O3b;fegWhh z$@fZU`m#dctfHU(#{<9j$(P$?65bTi@#eX858r^0;x3de@S0{6C7*u z;7T(~6ZM%*cGYYqY4wS9DG3pczDaw!`uXh=qlh<8_ z;O- z`~xApZ$_$|=XB%fIM;{BJ#0)Sxtevx=52}rrmxFV7o;h5L1_$vB0md=0Vxoo zWU>T^Ifz(FY-@hM!6p*u%^dQg9naDp5VNTZw8)h|IM;%%n1F_|;v^$geiBmv1}^Y@T6eCvvQ(L@SG4vVSkW+d}V``9Fsitk~R zZFLgNngb$O(R(1IG#vRXAbCKP>`2B8WWflTjSxlV zZ<7FN@s6rMfnvM(uKg%BC4ubjYh;rrnBh&$r#G`(cv3UFg5Ak`V1yUbC>PVvPUDN)F^`S>qh>hzF`m&F&=h8_F0qxsx*1=kA~PSati(nr z=6wg)qx{`NEJ-&OYiR*{`{6L`r$5OSlI5_vzdZwudovf)Y3$jy*uSOFF{n&TnInvbnsjjVCLyfB8xzLW5HVO$=cXh+_MJHzDNPwd^N!m#T)z_x^AFB3cO{V=+vonZHd zV?PI*VU8b9(=DeUnl~=dPf4_RT%v{VL)1Dh(LRW>BTCPH^8xNQJ5TH$zRxfM>HLci z(6G~T!$#9a{&^SrWgnNf$`9e~zlyi3AHth!v^V=l@b)!%GyRw}@;`R7P3#BWj}W07 z*CQ|4SOVir7qh0+R$hS%wt;W!VRMDbLToxw{5+1iM$A)Ys!Vcu$bZqio~T!}yK zuKEv%f;{S$X9e!5oyaP%Eu}5bV6`EPGDp z4icn15B~vR=SAmOQwD7*cP0M>ygms*QL<4{y1v57=k~ED(A4@qG&PT(=)<5{`FDM6 mJ%9Z?o2K2g;mLJRTXI%BveH&kVXLz8lJo4==KbfHPxF6+;;GdD delta 5157 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 diff --git a/processing/build/windows/make.sh b/processing/build/windows/make.sh index 0977531e3..02b1e066a 100755 --- a/processing/build/windows/make.sh +++ b/processing/build/windows/make.sh @@ -145,8 +145,8 @@ cd ../.. PLATFORM=windows -CLASSPATH="..\\build\\$PLATFORM\\work\\lib\\core.jar:..\\build\\$PLATFORM\\work\\java\\lib\\rt.jar" -JIKES="..\\build\\$PLATFORM\\work\\jikes.exe" +CLASSPATH="..\\build\\$PLATFORM\\work\\lib\\core.jar;..\\build\\$PLATFORM\\work\\java\\lib\\rt.jar" +JIKES=../build/$PLATFORM/work/jikes CORE="..\\build\\$PLATFORM\\work\\lib\\core.jar" LIBRARIES="..\\build\\$PLATFORM\\work\\libraries" @@ -157,14 +157,13 @@ cd .. # SERIAL LIBRARY echo Building serial library... cd ../serial -$JIKES -target 1.1 +D -classpath "code\\RXTXcomm.jar:$CORE:$CLASSPATH" -d . *.java +$JIKES -target 1.1 +D -classpath "code\\RXTXcomm.jar;$CORE;$CLASSPATH" -d . *.java rm -f library/serial.jar zip -r0q library/serial.jar processing rm -rf processing mkdir -p $LIBRARIES/serial/library/ cp library/serial.jar $LIBRARIES/serial/library/ - # NET LIBRARY echo Building net library... cd ../net @@ -189,7 +188,7 @@ else exit 1; fi cd ../video -$JIKES -target 1.1 +D -classpath "$QTJAVA:$CLASSPATH" -d . *.java +$JIKES -target 1.1 +D -classpath "$QTJAVA;$CLASSPATH" -d . *.java rm -f library/video.jar zip -r0q library/video.jar processing rm -rf processing @@ -200,7 +199,7 @@ cp library/video.jar $LIBRARIES/video/library/ # OPENGL LIBRARY echo Building OpenGL library... cd ../opengl -$JIKES -target 1.1 +D -classpath "library\\jogl.jar:$CLASSPATH" -d . *.java +$JIKES -target 1.1 +D -classpath "library\\jogl.jar;$CLASSPATH" -d . *.java rm -f library/opengl.jar zip -r0q library/opengl.jar processing rm -rf processing @@ -208,8 +207,8 @@ mkdir -p $LIBRARIES/opengl/library/ cp library/opengl.jar $LIBRARIES/opengl/library/ -CLASSPATH=..\\$CLASSPATH -JIKES=..\\..\\build\\$PLATFORM\\work\\jikes +CLASSPATH="..\\..\\build\\$PLATFORM\\work\\lib\\core.jar;..\\..\\build\\$PLATFORM\\work\\java\\lib\\rt.jar" +JIKES=../../build/$PLATFORM/work/jikes CORE=..\\..\\build\\$PLATFORM\\work\\lib\\core.jar LIBRARIES=..\\..\\build\\$PLATFORM\\work\\libraries @@ -224,7 +223,6 @@ rm -rf simong mkdir -p $LIBRARIES/particles/library/ cp library/particles.jar $LIBRARIES/particles/library/ -pwd - echo echo Done. +