diff --git a/.gitignore b/.gitignore index 2dde532..a2df76f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,9 @@ .idea/ -cmake-build-debug/ -cmake-build-release/ -build/vs17/ +cmake-build-debug*/ +cmake-build-release*/ +build/vs*/ +out/ +CMakeSettings.json ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. diff --git a/MakeRelease.bat b/MakeRelease.bat index dda670c..0fa0c73 100644 --- a/MakeRelease.bat +++ b/MakeRelease.bat @@ -4,6 +4,7 @@ ECHO. SET Platform=Win32 SET NoArgs=False +SET BinDir=cmake-build-release---%Platform%\bin\\ if "%1" == "" SET NoArgs=True @@ -61,7 +62,7 @@ DEL /F /Q "..\Jupiter Bot.zip" GOTO EOF :BinaryCopy: -ROBOCOPY "bin\%Platform%\Release\\" "..\Jupiter Bot Binaries\\" *.dll *.exe /S /xf Tester.exe +ROBOCOPY "%BinDir%" "..\Jupiter Bot Binaries\\" *.dll *.exe /S /xf Tester.exe ROBOCOPY "Configs\\" "..\Jupiter Bot Binaries\Configs\\" * ROBOCOPY ".\\" "..\Jupiter Bot Binaries\\" *.ini *.txt LICENSE "C:\Program Files\WinRAR\WinRAR.exe" a -r "..\Jupiter Bot Binaries.zip" "..\Jupiter Bot Binaries" @@ -69,7 +70,7 @@ GOTO EOF :SourceCopy: ROBOCOPY ".\\" "..\Jupiter Bot Source\\" *.* /S /XD Win32 x64 .* -ROBOCOPY "bin\%Platform%\Release\\" "..\Jupiter Bot Source\bin\%Platform%\Release\\" *.dll *.exe /S +ROBOCOPY "%BinDir%" "..\Jupiter Bot Source\%BinDir%" *.dll *.exe /S ROBOCOPY "Configs\\" "..\Jupiter Bot Source\Configs\\" * ROBOCOPY ".\\" "..\Jupiter Bot Source\\" *.ini *.txt LICENSE "C:\Program Files\WinRAR\WinRAR.exe" a -r "..\Jupiter Bot.zip" "..\Jupiter Bot Source" diff --git a/build/cmake_vs19.bat b/build/cmake_vs19.bat new file mode 100644 index 0000000..75f7eb5 --- /dev/null +++ b/build/cmake_vs19.bat @@ -0,0 +1,4 @@ +rmdir /S /Q vs19 +mkdir vs19 +cd vs19 +cmake ..\.. -G "Visual Studio 16 2019" \ No newline at end of file diff --git a/src/Jupiter b/src/Jupiter index cf77a1b..d552a20 160000 --- a/src/Jupiter +++ b/src/Jupiter @@ -1 +1 @@ -Subproject commit cf77a1b6a72491686f370be33bc367f28bebeb40 +Subproject commit d552a20869c1a8a1b7840405325cb420d9f86ff0