diff --git a/Makefile b/Makefile index bfa6a1a..7b68b50 100644 --- a/Makefile +++ b/Makefile @@ -12,8 +12,6 @@ linuxRelease = $(executable)-$(version)-linux.tar.gz windows: @echo off - powershell if (Test-Path data\config\config.bin) {Remove-Item data\config\config.bin -Recurse -Force} - powershell if (Test-Path data\config\score.bin) {Remove-Item data\config\score.bin -Recurse -Force} g++ $(source) -D DEBUG -std=c++11 -Wall -Os -lmingw32 -lws2_32 -lSDL2main -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows -o $(executable).exe strip -s -R .comment -R .gnu.version $(executable).exe --strip-unneeded @@ -21,8 +19,6 @@ windows_release: @echo off # Remove data - powershell if (Test-Path data\config\config.bin) {Remove-Item data\config\config.bin -Recurse -Force} - powershell if (Test-Path data\config\score.bin) {Remove-Item data\config\score.bin -Recurse -Force} powershell if (Test-Path $(releaseFolder)) {Remove-Item $(releaseFolder) -Recurse -Force} # Create folders @@ -35,6 +31,9 @@ windows_release: powershell Copy-Item "README.md" -Destination "$(releaseFolder)" powershell Copy-Item "release/SDL2.dll" -Destination "$(releaseFolder)" +# Remove data + powershell if (Test-Path data\config\score.bin) {Remove-Item data\config\score.bin -Recurse -Force} + # Build g++ $(source) -std=c++11 -Wall -Os -lmingw32 -lws2_32 -lSDL2main -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows -o "$(releaseFolder)/$(executable).exe" strip -s -R .comment -R .gnu.version "$(releaseFolder)/$(executable).exe" --strip-unneeded @@ -47,14 +46,10 @@ windows_release: powershell if (Test-Path $(releaseFolder)) {Remove-Item $(releaseFolder) -Recurse -Force} macos: - rm -f data/config/config.bin - rm -f data/config/score.bin clang++ $(source) -D DEBUG -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -o $(executable)_macos macos_release: # Remove data and possible data - rm -f data/config/config.bin - rm -f data/config/score.bin rm -rdf "$(releaseFolder)" rm -rdf Frameworks rm -f tmp.dmg @@ -72,6 +67,9 @@ macos_release: cp -R release/SDL2.framework "$(releaseFolder)/$(appName).app/Contents/Frameworks" cp -R release/SDL2.framework Frameworks +# Delete data + rm -f "$(releaseFolder)/$(appName).app/Contents/Resources/data/config/score.bin" + # Copy files cp release/*.icns "$(releaseFolder)/$(appName).app/Contents/Resources" cp release/Info.plist "$(releaseFolder)/$(appName).app/Contents" @@ -100,15 +98,11 @@ macos_release: rm -rdf "$(releaseFolder)" linux: - rm -f data/config/config.bin - rm -f data/config/score.bin g++ $(source) -D DEBUG -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o $(executable)_linux strip -s -R .comment -R .gnu.version $(executable)_linux --strip-unneeded linux_release: # Remove data - rm -f data/config/config.bin - rm -f data/config/score.bin rm -rdf $(releaseFolder) # Create folders @@ -120,6 +114,9 @@ linux_release: cp LICENSE $(releaseFolder) cp README.md $(releaseFolder) +# Delete data + rm -f $(releaseFolder)/data/config/score.bin + # Build g++ $(source) -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o $(releaseFolder)/$(executable) strip -s -R .comment -R .gnu.version $(releaseFolder)/$(executable) --strip-unneeded diff --git a/release/config.txt b/release/config.txt index aaca363..d5a8f9a 100644 --- a/release/config.txt +++ b/release/config.txt @@ -18,6 +18,6 @@ input1=1 ## ONLINE OPTIONS enabled=false -server= -port= +server=jaildoctor.duckdns.org +port=9911 jailerID=