chore: 1.0.5

MurkyYT · Aug 26, 2024 · 7b3f651 · 7b3f651
1 parent ae5fa0f
commit 7b3f651
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/Android/build-tools/29.0.1/d8.bat b/Android/build-tools/29.0.1/d8.bat
@@ -23,7 +23,7 @@ REM and set up progdir to be the fully-qualified pathname of its directory.
 set prog=%~f0
 
 rem Check we have a valid Java.exe in the path.
-set java_exe=c:\Program Files\Java\jdk1.8.0_321\bin\java.exe
+set java_exe=C:\Program Files (x86)\Common Files\Oracle\Java\java8path\java.exe
 REM if exist    "%~dp0..\tools\lib\find_java.bat" call    "%~dp0..\tools\lib\find_java.bat"
 REM if exist "%~dp0..\..\tools\lib\find_java.bat" call "%~dp0..\..\tools\lib\find_java.bat"
 if not defined java_exe goto :EOF

diff --git a/Android/build-tools/29.0.1/libwinpthread-1.dll b/Android/build-tools/29.0.1/libwinpthread-1.dll
diff --git a/compile.bat b/compile.bat
@@ -1,8 +1,8 @@
-@call "VsDevCmd.bat"
+@echo OFF
 cmake src\AndroDem -A Win32 -B "src\AndroDem\build32"
-cd  src\AndroDem\build32
+cd src\AndroDem\build32
 msbuild AndroDem.sln  /p:Configuration="Release"
-cd..
+cd ..
 cmake -A x64 -B "build64"
 cd build64
 msbuild AndroDem.sln  /p:Configuration="Release"

diff --git a/src/AndroDem/resource.h b/src/AndroDem/resource.h
@@ -1,7 +1,7 @@
 // Used by AndroDem.rc
 //
-#define VER "1.0.4"
-#define COMMA_VER 1,0,4
+#define VER "1.0.5"
+#define COMMA_VER 1,0,5
 #define IDI_ANDRODEM                    100
 #define IDI_LEVEL0WIFI                  101
 #define IDI_LEVEL1WIFI_DARK                  102

diff --git a/src/Server/build_without_gradle.bat b/src/Server/build_without_gradle.bat
@@ -30,4 +30,4 @@ cd ..\java
 
 echo Dexing...
 cd "%CLASSES_DIR%"
-"%ANDROID_HOME%\build-tools\%BUILD_TOOLS%\d8" --classpath "%ANDROID_JAR%" com\murky\androdem\\*.class --output "%SERVER_DIR%\..\..\data"
+"%ANDROID_HOME%\build-tools\%BUILD_TOOLS%\d8" --classpath "%ANDROID_JAR%" "%BUILD_DIR%\classes\com\murky\androdem\\*.class" --output "%SERVER_DIR%\..\..\data"