Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update two references to non-existent vars #688

Merged
merged 4 commits into from
Jun 8, 2024
Merged

Update two references to non-existent vars #688

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c3b1c62
THEOS_PACKAGE_NAME no longer exists, so warn about FW_PACKAGE_FILENAM…
L1ghtmann Jan 6, 2023
9864581
Bring Windows' iphone.mk up-to-speed (replace dep vars, etc)
L1ghtmann Jan 6, 2023
a5fd5c8
Adjust FW_PACKAGE_FILENAME check
L1ghtmann Apr 16, 2023
efda51f
Merge branch 'master' into pr6
L1ghtmann Aug 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion makefiles/legacy.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ FW_PACKAGE_NAME = $(THEOS_PACKAGE_NAME)$(warning FW_PACKAGE_NAME is deprecated.
FW_PACKAGE_ARCH = $(THEOS_PACKAGE_ARCH)$(warning FW_PACKAGE_ARCH is deprecated. Please migrate to THEOS_PACKAGE_ARCH.)
FW_PACKAGE_VERSION = $(THEOS_PACKAGE_BASE_VERSION)$(warning FW_PACKAGE_VERSION is deprecated. Please migrate to THEOS_PACKAGE_BASE_VERSION.)
FW_PACKAGE_DEBVERSION = $(THEOS_PACKAGE_VERSION)$(warning FW_PACKAGE_DEBVERSION is deprecated. Please migrate to THEOS_PACKAGE_VERSION.)
FW_PACKAGE_FILENAME = $(THEOS_PACKAGE_FILENAME)$(warning FW_PACKAGE_FILENAME is deprecated. Please migrate to THEOS_PACKAGE_FILENAME.)
FW_PACKAGE_FILENAME = $(error FW_PACKAGE_FILENAME is deprecated. The filename for the most recent package can be found in '.theos/last_package'.)
FW_PACKAGE_STAGING_DIR = $(THEOS_STAGING_DIR)$(warning FW_PACKAGE_STAGING_DIR is deprecated. Please migrate to THEOS_STAGING_DIR.)

ifdef FW_DEVICE_TUNNEL
Expand Down
19 changes: 12 additions & 7 deletions makefiles/targets/Windows/iphone.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,25 @@ _THEOS_TARGET_PLATFORM_SDK_NAME := iPhoneOS
_THEOS_TARGET_PLATFORM_FLAG_NAME := iphoneos
_THEOS_TARGET_PLATFORM_SWIFT_NAME := apple-ios

SWIFTBINPATH ?= $(THEOS)/toolchain/swift/bin
SDKBINPATH ?= $(THEOS)/toolchain/$(THEOS_PLATFORM_NAME)/$(THEOS_TARGET_NAME)/bin

# Determine toolchain to use based on file existence.
ifeq ($(SDKTARGET),)
ifeq ($(call __exists,$(THEOS)/toolchain/$(THEOS_PLATFORM_NAME)/$(THEOS_TARGET_NAME)/bin/arm64-apple-darwin14-ld),$(_THEOS_TRUE))
SDKTARGET ?= arm64-apple-darwin14
ifeq ($(_THEOS_TARGET_SDK_BIN_PREFIX),)
ifeq ($(call __exists,$(SDKBINPATH)/armv7-apple-darwin11-ld),$(_THEOS_TRUE))
_THEOS_TARGET_SDK_BIN_PREFIX ?= armv7-apple-darwin11-
else ifeq ($(call __exists,$(SDKBINPATH)/arm64-apple-darwin14-ld),$(_THEOS_TRUE))
_THEOS_TARGET_SDK_BIN_PREFIX ?= arm64-apple-darwin14-
else
SDKTARGET ?= armv7-apple-darwin11
# toolchain has no prefix so we are responsible of supplying target triple to clang for cross compiling
_THEOS_TARGET_USE_CLANG_TARGET_FLAG := $(_THEOS_TRUE)
endif
endif

SWIFTBINPATH ?= $(THEOS)/toolchain/swift/bin
SDKBINPATH ?= $(THEOS)/toolchain/$(THEOS_PLATFORM_NAME)/$(THEOS_TARGET_NAME)/bin
PREFIX := $(SDKBINPATH)/$(SDKTARGET)-
PREFIX := $(SDKBINPATH)/$(_THEOS_TARGET_SDK_BIN_PREFIX)

include $(THEOS_MAKE_PATH)/targets/_common/darwin_head.mk
include $(THEOS_MAKE_PATH)/targets/_common/iphone.mk
include $(THEOS_MAKE_PATH)/targets/_common/darwin_tail.mk

endif
2 changes: 1 addition & 1 deletion makefiles/targets/_common/cygwin.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Variables that are common to all Linux-based targets.
# Variables that are common to all Windows-based targets.
TARGET_EXE_EXT := .exe
TARGET_LIB_EXT := .dll
TARGET_AR_EXT := .a
Expand Down