Skip to content

Commit

Permalink
Updated Jupiter submodule to 0.19; updated .gitignore
Browse files Browse the repository at this point in the history
  • Loading branch information
JAJames committed Jan 23, 2020
1 parent ddb99f0 commit d914f4b
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 6 deletions.
8 changes: 5 additions & 3 deletions .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.
Expand Down
5 changes: 3 additions & 2 deletions MakeRelease.bat
Expand Up @@ -4,6 +4,7 @@ ECHO.

SET Platform=Win32
SET NoArgs=False
SET BinDir=cmake-build-release---%Platform%\bin\\

if "%1" == "" SET NoArgs=True

Expand Down Expand Up @@ -61,15 +62,15 @@ 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"
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"
Expand Down
4 changes: 4 additions & 0 deletions build/cmake_vs19.bat
@@ -0,0 +1,4 @@
rmdir /S /Q vs19
mkdir vs19
cd vs19
cmake ..\.. -G "Visual Studio 16 2019"
2 changes: 1 addition & 1 deletion src/Jupiter

0 comments on commit d914f4b

Please sign in to comment.