mirror of
https://github.com/palera1n/palera1n.git
synced 2026-10-24 02:59:49 +02:00
Makefile and actions fixes
Signed-off-by: Nick Chan <[email protected]>
This commit is contained in:
1 parent
cab5a9f9f8
commit
2d7882051e
3 files changed
+10
-5
No files matched your search
@@ -104,7 +104,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
run: |
|
||||||
make
|
gmake -j$(sysctl -n hw.ncpu)
|
||||||
|
|
||||||
- name: Prepare upload directory
|
- name: Prepare upload directory
|
||||||
run: |
|
run: |
|
||||||
@@ -259,7 +259,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
run: |
|
||||||
make palera1n WITH_STATIC=1 WITH_GUI=1 WITH_TUI=1 WITH_CIDERRAIN=1 BUILD_TYPE=Release JOBS=$(sysctl -n hw.ncpu)
|
make palera1n WITH_STATIC=1 WITH_GUI=1 WITH_TUI=1 WITH_CIDERRAIN=1 WITH_CIDERRAIN=1 BUILD_TYPE=Release JOBS=$(sysctl -n hw.ncpu)
|
||||||
strip -x build/palera1n.app/Contents/MacOS/palera1n
|
strip -x build/palera1n.app/Contents/MacOS/palera1n
|
||||||
|
|
||||||
- name: Package
|
- name: Package
|
||||||
@@ -308,7 +308,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
run: |
|
||||||
make palera1n_xcode PLATFORM=iphoneos WITH_STATIC=1 BUILD_TYPE=Release JOBS=$(sysctl -n hw.ncpu)
|
gmake palera1n_xcode PLATFORM=iphoneos WITH_STATIC=1 WITH_CIDERRA1N=1 BUILD_TYPE=Release JOBS=$(sysctl -n hw.ncpu)
|
||||||
cmake --build build
|
cmake --build build
|
||||||
|
|
||||||
- name: Package
|
- name: Package
|
||||||
|
|||||||
+1
-1
Submodule 1stparty/libciderra1n updated: c25b7b9489...e393d2f77d.
@@ -34,6 +34,7 @@ ifeq ($(PLATFORM),iphoneos)
|
|||||||
ifneq ($(UNAME_S),Darwin)
|
ifneq ($(UNAME_S),Darwin)
|
||||||
$(error iOS builds require macOS/Xcode)
|
$(error iOS builds require macOS/Xcode)
|
||||||
endif
|
endif
|
||||||
|
EXTRA_TARGETS = apple-include
|
||||||
TARGET_SYSROOT := $(shell xcrun --sdk iphoneos --show-sdk-path)
|
TARGET_SYSROOT := $(shell xcrun --sdk iphoneos --show-sdk-path)
|
||||||
else ifeq ($(PLATFORM),macos)
|
else ifeq ($(PLATFORM),macos)
|
||||||
ifneq ($(UNAME_S),Darwin)
|
ifneq ($(UNAME_S),Darwin)
|
||||||
@@ -79,6 +80,8 @@ else
|
|||||||
APPLE_INCLUDE_DEP :=
|
APPLE_INCLUDE_DEP :=
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
all: palera1n
|
||||||
|
|
||||||
apple-include:
|
apple-include:
|
||||||
mkdir -p $(CUSTOM_INCLUDE_PATH)/{bsm,objc,os/internal,sys,firehose,CoreFoundation,FSEvents,IOSurface,IOKit/kext,libkern,kern,arm,{mach/,}machine,CommonCrypto,Security,CoreSymbolication,Kernel/{kern,IOKit,libkern},rpc,rpcsvc,xpc/private,ktrace,mach-o,dispatch}
|
mkdir -p $(CUSTOM_INCLUDE_PATH)/{bsm,objc,os/internal,sys,firehose,CoreFoundation,FSEvents,IOSurface,IOKit/kext,libkern,kern,arm,{mach/,}machine,CommonCrypto,Security,CoreSymbolication,Kernel/{kern,IOKit,libkern},rpc,rpcsvc,xpc/private,ktrace,mach-o,dispatch}
|
||||||
cp -af $(MACOSX_SYSROOT)/usr/include/{arpa,bsm,hfs,net,xpc,netinet,servers,timeconv.h,launch.h} $(CUSTOM_INCLUDE_PATH)
|
cp -af $(MACOSX_SYSROOT)/usr/include/{arpa,bsm,hfs,net,xpc,netinet,servers,timeconv.h,launch.h} $(CUSTOM_INCLUDE_PATH)
|
||||||
@@ -128,7 +131,7 @@ payloads:
|
|||||||
>> "src/gen/embedded/$$name.h"; \
|
>> "src/gen/embedded/$$name.h"; \
|
||||||
done
|
done
|
||||||
|
|
||||||
palera1n: payloads
|
palera1n: payloads $(EXTRA_TARGETS)
|
||||||
@cmake -S . -B build \
|
@cmake -S . -B build \
|
||||||
$(CMAKE_COMMON_ARGS) \
|
$(CMAKE_COMMON_ARGS) \
|
||||||
$(CMAKE_APPLE_ARGS) && \
|
$(CMAKE_APPLE_ARGS) && \
|
||||||
@@ -151,3 +154,5 @@ clean:
|
|||||||
@rm -rf apple-include-*
|
@rm -rf apple-include-*
|
||||||
@if [ -d 1stparty/libciderra1n ]; then $(MAKE) -C 1stparty/libciderra1n clean; fi
|
@if [ -d 1stparty/libciderra1n ]; then $(MAKE) -C 1stparty/libciderra1n clean; fi
|
||||||
@$(MAKE) -C 1stparty/libopenra1n clean
|
@$(MAKE) -C 1stparty/libopenra1n clean
|
||||||
|
|
||||||
|
.PHONY: palera1n palera1n_xcode palera1n_mingw payloads clean
|
||||||
Reference in new issue
Block a user