Skip to content

Commit

Permalink
Improve module usage with libroot and substrate (#93)
Browse files Browse the repository at this point in the history
* substrate.h includes CydiaSubstrate/CydiaSubstrate.h

* Remove link declaration for libroot module

* libroot.h includes libroot/libroot.h

* Add theos/lib as framework directory

* Swap CydiaSubstrate.h <-> substrate.h symlinks
  • Loading branch information
leptos-null authored May 16, 2024
1 parent a259b25 commit 34ee082
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 512 deletions.
13 changes: 10 additions & 3 deletions .github/workflows/compile-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,22 @@ jobs:
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout theos/sdks
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: theos/sdks
ref: bb425abf3acae8eac328b828628b82df544d2774 # pinned, should be updated as appropriate
sparse-checkout: iPhoneOS14.5.sdk
path: sdks

- name: Checkout theos/lib
uses: actions/checkout@v4
with:
repository: theos/lib
ref: master # always check out latest
path: lib

- name: Checkout theos/headers
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: headers

Expand Down Expand Up @@ -61,7 +68,7 @@ jobs:
{
echo "#import <${HEADER}>"
echo "int main() {}"
} | clang -I "${HEADER_DIR}" -isysroot sdks/iPhoneOS14.5.sdk \
} | clang -I "${HEADER_DIR}" -F "lib" -isysroot sdks/iPhoneOS14.5.sdk \
-target arm64-apple-ios14.5 -arch arm64 \
-x "${{ matrix.language }}" ${{ matrix.cflags }} \
${ADDITIONAL_FLAGS} -fsyntax-only -
Expand Down
1 change: 0 additions & 1 deletion CydiaSubstrate.h

This file was deleted.

1 change: 1 addition & 0 deletions CydiaSubstrate.h
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include <CydiaSubstrate/CydiaSubstrate.h>
1 change: 0 additions & 1 deletion libroot.h

This file was deleted.

1 change: 1 addition & 0 deletions libroot.h
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include <libroot/libroot.h>
1 change: 0 additions & 1 deletion libroot/module.modulemap
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
module libroot {
umbrella header "libroot.h"
link "root"

export *
}
Loading

0 comments on commit 34ee082

Please sign in to comment.