From 10c29eb54726cd688f1d6b1435a3c5a56e732d0e Mon Sep 17 00:00:00 2001 From: Sergio Valor Martinez Date: Tue, 22 Nov 2022 13:20:13 +0100 Subject: [PATCH] Actualizado Makefile --- Makefile | 71 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/Makefile b/Makefile index 18e0764..630b717 100644 --- a/Makefile +++ b/Makefile @@ -12,36 +12,33 @@ linuxRelease = $(executable)-$(version)-linux.tar.gz windows: @echo off - 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 $(executable).exe - strip -s -R .comment -R .gnu.version $(executable).exe --strip-unneeded + 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 "$(executable).exe" + strip -s -R .comment -R .gnu.version "$(executable).exe" --strip-unneeded windows_debug: @echo off - 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)_debug.exe - strip -s -R .comment -R .gnu.version $(executable)_debug.exe --strip-unneeded + 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)_debug.exe" + strip -s -R .comment -R .gnu.version "$(executable)_debug.exe" --strip-unneeded windows_release: @echo off -# Remove data - powershell if (Test-Path $(releaseFolder)) {Remove-Item $(releaseFolder) -Recurse -Force} +# Create release folder + powershell if (Test-Path "$(releaseFolder)") {Remove-Item "$(releaseFolder)" -Recurse -Force} + powershell if (-not (Test-Path "$(releaseFolder)")) {New-Item "$(releaseFolder)" -ItemType Directory} -# Create folders - powershell if (-not (Test-Path $(releaseFolder))) {New-Item $(releaseFolder) -ItemType Directory} - -# Copy data +# Prepare data folder powershell Copy-Item -Path "data" -Destination "$(releaseFolder)" -recurse -Force - powershell Copy-Item "LICENSE" -Destination "$(releaseFolder)" - powershell Copy-Item "README.md" -Destination "$(releaseFolder)" - powershell Copy-Item "release/SDL2.dll" -Destination "$(releaseFolder)" - -# Remove data powershell if (Test-Path "$(releaseFolder)\data\room\map.world") {Remove-Item "$(releaseFolder)\data\room\map.world" -Recurse -Force} powershell if (Test-Path "$(releaseFolder)\data\room\standard.tsx") {Remove-Item "$(releaseFolder)\data\room\standard.tsx" -Recurse -Force} powershell if (Test-Path "$(releaseFolder)\data\config") {Remove-Item "$(releaseFolder)\data\config" -Recurse -Force} - -# Create data powershell if (-not (Test-Path "$(releaseFolder)\data\config")) {New-Item "$(releaseFolder)\data\config" -ItemType Directory} + powershell Copy-Item "release\config.txt" -Destination "$(releaseFolder)\data\config" + +# Copy root files + powershell Copy-Item "LICENSE" -Destination "$(releaseFolder)" + powershell Copy-Item "README.md" -Destination "$(releaseFolder)" + powershell Copy-Item "release\SDL2.dll" -Destination "$(releaseFolder)" # 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" @@ -52,16 +49,16 @@ windows_release: powershell Compress-Archive -Path "$(releaseFolder)"/* -DestinationPath $(windowsRelease) # Remove folder - powershell if (Test-Path $(releaseFolder)) {Remove-Item $(releaseFolder) -Recurse -Force} + powershell if (Test-Path "$(releaseFolder)") {Remove-Item "$(releaseFolder)" -Recurse -Force} macos: - clang++ $(source) -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -o $(executable) + clang++ $(source) -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -o "$(executable)" macos_debug: - clang++ $(source) -D DEBUG -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -o $(executable)_debug + clang++ $(source) -D DEBUG -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -o "$(executable)_debug" macos_release: -# Remove data and possible data +# Remove data and possible data from previous builds rm -rdf "$(releaseFolder)" rm -rdf Frameworks rm -f tmp.dmg @@ -90,6 +87,7 @@ macos_release: # Copy files cp release/*.icns "$(releaseFolder)/$(appName).app/Contents/Resources" cp release/Info.plist "$(releaseFolder)/$(appName).app/Contents" + cp release/config.txt "$(releaseFolder)/$(appName).app/Contents/Resources/data/config" cp LICENSE "$(releaseFolder)" cp README.md "$(releaseFolder)" @@ -114,24 +112,24 @@ macos_release: rm -rdf "$(releaseFolder)" linux: - g++ $(source) -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o $(executable) - strip -s -R .comment -R .gnu.version $(executable) --strip-unneeded + g++ $(source) -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o "$(executable)" + strip -s -R .comment -R .gnu.version "$(executable)" --strip-unneeded linux_debug: - g++ $(source) -D DEBUG -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o $(executable)_debug - strip -s -R .comment -R .gnu.version $(executable)_debug --strip-unneeded + g++ $(source) -D DEBUG -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o "$(executable)_debug" + strip -s -R .comment -R .gnu.version "$(executable)_debug" --strip-unneeded linux_release: # Remove data - rm -rdf $(releaseFolder) + rm -rdf "$(releaseFolder)" # Create folders - mkdir -p $(releaseFolder) + mkdir -p "$(releaseFolder)" # Copy data - cp -R data $(releaseFolder) - cp LICENSE $(releaseFolder) - cp README.md $(releaseFolder) + cp -R data "$(releaseFolder)" + cp LICENSE "$(releaseFolder)" + cp README.md "$(releaseFolder)" # Delete data rm -f "$(releaseFolder)/data/room/map.world" @@ -141,13 +139,16 @@ linux_release: # Create folders mkdir -p "$(releaseFolder)/data/config" +# Copy data + cp release/config.txt "$(releaseFolder)/data/config" + # 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 + 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 # Pack files - rm -f $(linuxRelease) - cd $(releaseFolder) && tar -czvf ../$(linuxRelease) * + rm -f "$(linuxRelease)" + cd "$(releaseFolder)" && tar -czvf "../$(linuxRelease)" * # Remove data - rm -rdf $(releaseFolder) \ No newline at end of file + rm -rdf "$(releaseFolder)" \ No newline at end of file