Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 6 commits
  • 6 files changed
  • 0 commit comments
  • 1 contributor
View
2  .gitignore
@@ -10,7 +10,7 @@ installer/install/install_data
cbc/CBCJVM/target
consoleDownload/bin
.settings
-.DS_Store?
+.DS_Store
*.log
*.out
*.sql
View
2  cbc/CBCJVM/jni/compiler
@@ -1,5 +1,5 @@
#!/bin/sh
-/mnt/kiss/bin/gcc -c -I/mnt/kiss/usercode/include -DCBC -Ijamvm -include track.h -include stdio.h -include cbc.h -include compat.h -include process.h -include create.h -include botball.h $1
+/mnt/kiss/gcc/bin/gcc -c -I/mnt/kiss/usercode/include -DCBC -Ijamvm -include track.h -include stdio.h -include cbc.h -include compat.h -include process.h -include create.h -include botball.h $1
sync
sync
View
2  cbc/CBCJVM/jni/linker
@@ -1,5 +1,5 @@
#!/bin/sh
-/mnt/kiss/bin/gcc -shared -Wl,--whole-archive -L/mnt/kiss/usercode/lib -lcbc -ltrack -lshared /mnt/kiss/usercode/lib/init.o -lpthread -lm -Wl,--no-whole-archive -o CBC.so $@
+/mnt/kiss/gcc/bin/gcc -shared -Wl,--whole-archive -L/mnt/kiss/usercode/lib -lcbc -ltrack -lshared /mnt/kiss/usercode/lib/init.o -lpthread -lm -Wl,--no-whole-archive -o CBC.so $@
sync
sync
View
2  cbc/CBCJVM/src/cbccore/Device.java
@@ -64,7 +64,7 @@ public static void init(SimulatorFactory preferedSim) {
isInited = true;
try {
if(System.getProperty("CBC") == null) throw new Exception();
- System.load("/mnt/user/jvm/cbc/CBC.so");
+ System.load("/mnt/kiss/jvm/cbc/CBC.so");
}
catch(Exception e) {
onCBC = false;
View
2  installer/build.xml
@@ -6,7 +6,7 @@
<!-- set global properties for this build -->
<property name="install" location="install"/>
<property name="installData" location="${install}/install_data"/>
- <property name="targetLibraries" location="${installData}/lib"/>
+ <property name="targetLibraries" location="${installData}/jvm/lib"/>
<property name="sourceLibraries" location="lib"/>
<property name="targetJVM" location="${installData}/jvm"/>
<property name="sourceJVM" location="jvm"/>
View
2  installer/jvm/java
@@ -1,3 +1,3 @@
#!/bin/sh
-LD_LIBRARY_PATH=/mnt/user/lib /mnt/user/jvm/jamvm -mx8M -cp /mnt/user/jvm/cbc:./ -Xbootclasspath:/mnt/user/lib/classes.zip:/mnt/user/lib/glibj.zip -DCBC $1 ./
+LD_LIBRARY_PATH=/mnt/kiss/jvm/lib /mnt/kiss/jvm/jamvm -mx10M -cp /mnt/kiss/jvm/cbc:./ -Xbootclasspath:/mnt/kiss/jvm/lib/classes.zip:/mnt/kiss/jvm/lib/glibj.zip -DCBC $1 ./

No commit comments for this range

Something went wrong with that request. Please try again.