rusefi
/
RomRaider
mirror of https://github.com/rusefi/RomRaider.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Working towards 64 bit support

This commit is contained in:
Dale Schultz 2022-03-29 19:43:38 -04:00
parent 4970956dbf
commit 3edc87c42d
No known key found for this signature in database
GPG Key ID: EA2C8AD6CB5C2AF2
30 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.classpath
View File

@ -5,10 +5,10 @@
<classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/common/com4j.jar"/>
<classpathentry kind="lib" path="lib/windows/j3dcore.jar"/>
<classpathentry kind="lib" path="lib/windows/j3dutils.jar"/>
<classpathentry kind="lib" path="lib/windows/vecmath.jar"/>
<classpathentry kind="lib" path="lib/windows/Graph3d.jar"/>
<classpathentry kind="lib" path="lib/common/j3dcore.jar"/>
<classpathentry kind="lib" path="lib/common/j3dutils.jar"/>
<classpathentry kind="lib" path="lib/common/vecmath.jar"/>
<classpathentry kind="lib" path="lib/common/Graph3d.jar"/>
<classpathentry kind="lib" path="lib/common/jama-1.0.2.jar"/>
<classpathentry kind="lib" path="lib/common/jep.jar"/>
<classpathentry kind="lib" path="lib/common/jamlab.jar"/>

4
3rdparty/launch4j/.classpath vendored
View File

@ -9,8 +9,8 @@
<classpathentry kind="lib" path="lib/commons-logging.jar"/>
<classpathentry kind="lib" path="lib/looks.jar"/>
<classpathentry kind="lib" path="lib/foxtrot.jar"/>
<classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.ant_1.7.0.v200706080842/lib/ant.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/j2sdk1.4.2"/>
<classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.ant_1.10.5.v20180808-0324/lib/ant.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/forms.jar"/>
<classpathentry kind="output" path="build"/>
</classpath>

0
lib/linux/Graph3d.jar → lib/common/Graph3d.jar
View File

BIN
lib/common/com4j-amd64.dll Normal file
View File

Binary file not shown.

0
lib/linux/j3dcore.jar → lib/common/j3dcore.jar
View File

0
lib/linux/j3dutils.jar → lib/common/j3dutils.jar
View File

0
lib/linux/vecmath.jar → lib/common/vecmath.jar
View File

BIN
lib/linux/32/j2534.so Normal file
View File

Binary file not shown.

0
lib/linux/libj3dcore-ogl-cg.so → lib/linux/32/libj3dcore-ogl-cg.so
View File

0
lib/linux/libj3dcore-ogl.so → lib/linux/32/libj3dcore-ogl.so
View File

0
lib/linux/libphidget21.so → lib/linux/32/libphidget21.so
View File

BIN
lib/linux/64/j2534.so Normal file
View File

Binary file not shown.

BIN
lib/linux/64/libj3dcore-ogl.so Normal file
View File

Binary file not shown.

BIN
lib/linux/64/libphidget21.so Normal file
View File

Binary file not shown.

BIN
lib/linux/j2534.so
View File

Binary file not shown.

0
lib/windows/j3dcore-d3d.dll → lib/windows/32/j3dcore-d3d.dll
View File

0
lib/windows/j3dcore-ogl-cg.dll → lib/windows/32/j3dcore-ogl-cg.dll
View File

0
lib/windows/j3dcore-ogl-chk.dll → lib/windows/32/j3dcore-ogl-chk.dll
View File

0
lib/windows/j3dcore-ogl.dll → lib/windows/32/j3dcore-ogl.dll
View File

0
lib/windows/phidget21.dll → lib/windows/32/phidget21.dll
View File

BIN
lib/windows/64/j3dcore-ogl.dll Normal file
View File

Binary file not shown.

BIN
lib/windows/64/phidget21.dll Normal file
View File

Binary file not shown.

BIN
lib/windows/Graph3d.jar
View File

Binary file not shown.

BIN
lib/windows/j3dcore.jar
View File

Binary file not shown.

BIN
lib/windows/j3dutils.jar
View File

Binary file not shown.

BIN
lib/windows/vecmath.jar
View File

Binary file not shown.

17
run.bat
View File

@ -1,11 +1,14 @@
:: Uncomment the line for the mode you wish to run. Comment all other lines.
:: Adjust path to javaw.exe as required for your Java system installation
rem start javaw -Djava.library.path=lib/windows -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=true -Xms64M -Xmx512M -jar RomRaider.jar 1>>"%HOMEPATH%\.RomRaider\romraider_sout.log" 2>&1
:: Start Editor
start javaw.exe -Djava.library.path=lib/windows -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=true -Xms64M -Xmx512M -jar RomRaider.jar
:: Start Logger in full screen mode
rem start javaw -Djava.library.path=lib/windows -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=true -Xms64M -Xmx512M -jar RomRaider.jar -logger.fullscreen
set java_path=
:: Start Editor with console redirected to %HOMEPATH%\.RomRaider\romraider_sout.log
start %java_path%javaw -Djava.library.path=lib/windows/32 -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=true -Xms64M -Xmx512M -jar RomRaider.jar 1>>"%HOMEPATH%\.RomRaider\romraider_sout.log" 2>&1
:: Start Logger
rem start javaw -Djava.library.path=lib/windows -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=true -Xms64M -Xmx512M -jar RomRaider.jar -logger
rem start %java_path%javaw -Djava.library.path=lib/windows/32 -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=true -Xms64M -Xmx512M -jar RomRaider.jar -logger 1>>"%HOMEPATH%\.RomRaider\romraider_sout.log" 2>&1
:: Start Logger in full screen mode
rem start %java_path%javaw -Djava.library.path=lib/windows/32 -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=true -Xms64M -Xmx512M -jar RomRaider.jar -logger.fullscreen 1>>"%HOMEPATH%\.RomRaider\romraider_sout.log" 2>&1
:: Start Logger in Touch screen mode
rem start javaw -Djava.library.path=lib/windows -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=true -Xms64M -Xmx512M -jar RomRaider.jar -logger.touch
rem start %java_path%javaw -Djava.library.path=lib/windows/32 -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=true -Xms64M -Xmx512M -jar RomRaider.jar -logger.touch 1>>"%HOMEPATH%\.RomRaider\romraider_sout.log" 2>&1

8
run.sh
View File

@ -4,9 +4,9 @@
# Make sure only one line is uncommented
# Java is expected to be available on your PATH
java -Djava.library.path=lib/linux -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=false -Xms64M -Xmx512M -XX:-UseParallelGC -XX:CompileThreshold=10000 -jar RomRaider.jar >> "$HOME/.RomRaider/romraider_sout.log" 2>&1
#java -Djava.library.path=lib/linux -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=false -Xms64M -Xmx512M -XX:-UseParallelGC -XX:CompileThreshold=10000 -jar RomRaider.jar -logger >> "$HOME/.RomRaider/romraider_sout.log" 2>&1
#java -Djava.library.path=lib/linux -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=false -Xms64M -Xmx512M -XX:-UseParallelGC -XX:CompileThreshold=10000 -jar RomRaider.jar -logger.fullscreen >> "$HOME/.RomRaider/romraider_sout.log" 2>&1
#java -Djava.library.path=lib/linux -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=false -Xms64M -Xmx512M -XX:-UseParallelGC -XX:CompileThreshold=10000 -jar RomRaider.jar -logger.touch >> "$HOME/.RomRaider/romraider_sout.log" 2>&1
java -Djava.library.path=lib/linux/32 -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=false -Xms64M -Xmx512M -XX:-UseParallelGC -XX:CompileThreshold=10000 -jar RomRaider.jar >> "$HOME/.RomRaider/romraider_sout.log" 2>&1
#java -Djava.library.path=lib/linux/32 -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=false -Xms64M -Xmx512M -XX:-UseParallelGC -XX:CompileThreshold=10000 -jar RomRaider.jar -logger >> "$HOME/.RomRaider/romraider_sout.log" 2>&1
#java -Djava.library.path=lib/linux/32 -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=false -Xms64M -Xmx512M -XX:-UseParallelGC -XX:CompileThreshold=10000 -jar RomRaider.jar -logger.fullscreen >> "$HOME/.RomRaider/romraider_sout.log" 2>&1
#java -Djava.library.path=lib/linux/32 -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=false -Xms64M -Xmx512M -XX:-UseParallelGC -XX:CompileThreshold=10000 -jar RomRaider.jar -logger.touch >> "$HOME/.RomRaider/romraider_sout.log" 2>&1
exit 0

3
templates/install-linux.xml.template
View File

@ -12,7 +12,6 @@
</authors>
<url>@supporturl@</url>
</info>
<native type="izpack" name="ShellLink.dll"/>
<guiprefs width="640" height="480" resizable="no"/>
<locale>
<langpack iso3="eng"/>
@ -73,7 +72,7 @@
<fileset dir="i18n" targetdir="$INSTALL_PATH/i18n"/>
<fileset dir="lib/common" targetdir="$INSTALL_PATH/lib/common"/>
<fileset dir="lib/linux" targetdir="$INSTALL_PATH/lib/linux"/>
<fileset dir="lib/linux/@build.arch@" targetdir="$INSTALL_PATH/lib/linux"/>
<updatecheck>
<include name="plugins/**"/>

2
templates/install-windows.xml.template
View File

@ -63,7 +63,7 @@
<fileset dir="i18n" targetdir="$INSTALL_PATH/i18n"/>
<fileset dir="lib/common" targetdir="$INSTALL_PATH/lib/common"/>
<fileset dir="lib/windows" targetdir="$INSTALL_PATH/lib/windows"/>
<fileset dir="lib/windows/@build.arch@" targetdir="$INSTALL_PATH/lib/windows"/>
<updatecheck>
<include name="plugins/**"/>