diff --git a/compile.cmd b/compile.cmd index f84b8b284..a27cef287 100644 --- a/compile.cmd +++ b/compile.cmd @@ -1,8 +1,5 @@ -set PROG8_COMPILER_DIR=compiler - -set PROG8_LIBDIR=%PROG8_COMPILER_DIR%/prog8lib -set PROG8CLASSPATH=%PROG8_COMPILER_DIR%/out/production/compiler/ +set PROG8CLASSPATH=./out/production/compiler;./out/production/parser set KOTLINPATH=%USERPROFILE%/.IdeaIC2018.3/config/plugins/Kotlin -set LIBJARS=%KOTLINPATH%/lib/kotlin-stdlib.jar;%KOTLINPATH%/lib/kotlin-reflect.jar;%PROG8_COMPILER_DIR%/antlr/lib/antlr-runtime-4.7.2.jar +set LIBJARS=%KOTLINPATH%/lib/kotlin-stdlib.jar;%KOTLINPATH%/lib/kotlin-reflect.jar;./parser/antlr/lib/antlr-runtime-4.7.2.jar -java -Dprog8.libdir=%PROG8_LIBDIR% -cp %PROG8CLASSPATH%;%LIBJARS% prog8.CompilerMainKt %* +java -cp %PROG8CLASSPATH%;%LIBJARS% prog8.CompilerMainKt %* diff --git a/compile.sh b/compile.sh index 00f1b8851..fc6db9520 100755 --- a/compile.sh +++ b/compile.sh @@ -2,6 +2,6 @@ PROG8CLASSPATH=./out/production/compiler:./out/production/parser KOTLINPATH=${HOME}/.IntelliJIdea2018.3/config/plugins/Kotlin -LIBJARS=${KOTLINPATH}/lib/kotlin-stdlib.jar:${KOTLINPATH}/lib/kotlin-reflect.jar:./parser//antlr/lib/antlr-runtime-4.7.2.jar +LIBJARS=${KOTLINPATH}/lib/kotlin-stdlib.jar:${KOTLINPATH}/lib/kotlin-reflect.jar:./parser/antlr/lib/antlr-runtime-4.7.2.jar java -cp ${PROG8CLASSPATH}:${LIBJARS} prog8.CompilerMainKt $* diff --git a/stackvm.cmd b/stackvm.cmd new file mode 100644 index 000000000..f53f438ab --- /dev/null +++ b/stackvm.cmd @@ -0,0 +1,5 @@ +set PROG8CLASSPATH=./out/production/compiler +set KOTLINPATH=%USERPROFILE%/.IdeaIC2018.3/config/plugins/Kotlin +set LIBJARS=%KOTLINPATH%/lib/kotlin-stdlib.jar;%KOTLINPATH%/lib/kotlin-reflect.jar + +java -cp %PROG8CLASSPATH%;%LIBJARS% prog8.StackVmMainKt %*