corregit makefile de macos

This commit is contained in:
2025-12-23 10:36:03 +01:00
parent 1951bcad11
commit fb394d23c9
3 changed files with 27 additions and 15 deletions

View File

@@ -5,7 +5,13 @@
"Bash(make:*)",
"Bash(echo:*)",
"Bash(objdump:*)",
"Bash(unzip:*)"
"Bash(unzip:*)",
"Bash(\"/Volumes/diskito/diskito.app/Contents/MacOS/diskito\")",
"Bash(pkill:*)",
"Bash(hdiutil detach:*)",
"Bash(cat:*)",
"Bash(hdiutil mount:*)",
"Bash(open \"/Volumes/Orni Attack/Orni Attack.app\")"
],
"deny": [],
"ask": []

View File

@@ -1,10 +1,10 @@
# CMakeLists.txt
cmake_minimum_required(VERSION 3.10)
project(diskito VERSION 0.7.1)
project(orni VERSION 0.7.1)
# Info del proyecto
set(PROJECT_LONG_NAME "diskito")
set(PROJECT_LONG_NAME "Orni Attack")
set(PROJECT_COPYRIGHT_ORIGINAL "© 1999 Visente i Sergi")
set(PROJECT_COPYRIGHT_PORT "© 2025 JailDesigner")
set(PROJECT_COPYRIGHT "${PROJECT_COPYRIGHT_ORIGINAL}, ${PROJECT_COPYRIGHT_PORT}")

View File

@@ -20,7 +20,16 @@ TARGET_FILE := $(DIR_BIN)$(TARGET_NAME)
RELEASE_FOLDER := $(TARGET_NAME)_release
RELEASE_FILE := $(RELEASE_FOLDER)/$(TARGET_NAME)
# Release file names
# ==============================================================================
# VERSION
# ==============================================================================
ifeq ($(OS),Windows_NT)
VERSION := v$(shell powershell -Command "(Select-String -Path 'CMakeLists.txt' -Pattern 'project.*VERSION\s+([0-9.]+)').Matches.Groups[1].Value")
else
VERSION := v$(shell grep "^project" CMakeLists.txt | tr -cd 0-9.)
endif
# Release file names (depend on VERSION, so must come after)
ifeq ($(OS),Windows_NT)
RAW_VERSION := $(shell powershell -Command "\"$(VERSION)\" -replace '^v', ''")
else
@@ -33,15 +42,6 @@ LINUX_RELEASE := $(TARGET_NAME)-$(VERSION)-linux-x64.tar.gz
RPI_RELEASE := $(TARGET_NAME)-$(VERSION)-rpi-arm64.tar.gz
APP_NAME := $(LONG_NAME)
# ==============================================================================
# VERSION
# ==============================================================================
ifeq ($(OS),Windows_NT)
VERSION := v$(shell powershell -Command "(Select-String -Path 'CMakeLists.txt' -Pattern 'project.*VERSION\s+([0-9.]+)').Matches.Groups[1].Value")
else
VERSION := v$(shell grep "^project" CMakeLists.txt | tr -cd 0-9.)
endif
# ==============================================================================
# SOURCE FILES
# ==============================================================================
@@ -151,12 +151,18 @@ macos_release: pack_tool resources.pack
@cp LICENSE "$(RELEASE_FOLDER)/" 2>/dev/null || echo "Warning: LICENSE not found"
@cp README.md "$(RELEASE_FOLDER)/" 2>/dev/null || echo "Warning: README.md not found"
# Update Info.plist version
@echo "Updating Info.plist with version $(RAW_VERSION)..."
# Update Info.plist version and names
@echo "Updating Info.plist with version $(RAW_VERSION) and names..."
@sed -i '' '/<key>CFBundleShortVersionString<\/key>/{n;s|<string>.*</string>|<string>$(RAW_VERSION)</string>|;}' \
"$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/Info.plist"
@sed -i '' '/<key>CFBundleVersion<\/key>/{n;s|<string>.*</string>|<string>$(RAW_VERSION)</string>|;}' \
"$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/Info.plist"
@sed -i '' '/<key>CFBundleExecutable<\/key>/{n;s|<string>.*</string>|<string>$(TARGET_NAME)</string>|;}' \
"$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/Info.plist"
@sed -i '' '/<key>CFBundleName<\/key>/{n;s|<string>.*</string>|<string>$(APP_NAME)</string>|;}' \
"$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/Info.plist"
@sed -i '' '/<key>CFBundleDisplayName<\/key>/{n;s|<string>.*</string>|<string>$(APP_NAME)</string>|;}' \
"$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/Info.plist"
# Compile for Apple Silicon using CMake
@cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=arm64