Skip to content

Commit

Permalink
Merge branch 'main' of github.com:geode-sdk/bindings
Browse files Browse the repository at this point in the history
  • Loading branch information
dankmeme01 committed Mar 1, 2025
2 parents 99f20ea + a73091f commit c8f15d3
Show file tree
Hide file tree
Showing 3 changed files with 227 additions and 98 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,13 @@ jobs:
7z x ninja.zip -o"$GITHUB_WORKSPACE/ninja"
echo "$GITHUB_WORKSPACE/ninja" >> $GITHUB_PATH
- name: Update LLVM (Windows)
shell: bash
run: |
curl -L https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/LLVM-17.0.6-win64.exe -o llvm-inst.exe
7z x llvm-inst.exe -ollvm bin/clang.exe bin/clang++.exe bin/lld-link.exe bin/llvm-rc.exe bin/*.dll lib/clang/*/include/*
echo "$GITHUB_WORKSPACE/llvm/bin" >> $GITHUB_PATH
if: matrix.config.id == 'win'
# - name: Update LLVM (Windows)
# shell: bash
# run: |
# curl -L https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/LLVM-17.0.6-win64.exe -o llvm-inst.exe
# 7z x llvm-inst.exe -ollvm bin/clang.exe bin/clang++.exe bin/lld-link.exe bin/llvm-rc.exe bin/*.dll lib/clang/*/include/*
# echo "$GITHUB_WORKSPACE/llvm/bin" >> $GITHUB_PATH
# if: matrix.config.id == 'win'

- name: Update Clang (Linux)
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ endif()

message(STATUS "Running Codegen")
execute_process(
COMMAND ./Codegen ${GEODE_TARGET_PLATFORM} ${GEODE_BINDINGS_PATH} ${GEODE_CODEGEN_PATH} ${GEODE_CODEDGEN_EXTRA_ARGS}
COMMAND ./Codegen ${GEODE_TARGET_PLATFORM} ${GEODE_BINDINGS_PATH} ${GEODE_CODEGEN_PATH} ${GEODE_CODEGEN_EXTRA_ARGS}
WORKING_DIRECTORY ${GEODE_CODEGEN_BINARY_OUT}
COMMAND_ECHO STDOUT
COMMAND_ERROR_IS_FATAL ANY
Expand All @@ -146,7 +146,7 @@ file(GLOB GEODE_CODEGEN_OUT_FILES
add_custom_command(
DEPENDS ${GEODE_BINDINGS_FILES}
COMMENT "Running Codegen"
COMMAND ./Codegen ${GEODE_TARGET_PLATFORM} ${GEODE_BINDINGS_PATH} ${GEODE_CODEGEN_PATH} ${GEODE_CODEDGEN_EXTRA_ARGS}
COMMAND ./Codegen ${GEODE_TARGET_PLATFORM} ${GEODE_BINDINGS_PATH} ${GEODE_CODEGEN_PATH} ${GEODE_CODEGEN_EXTRA_ARGS}
WORKING_DIRECTORY ${GEODE_CODEGEN_BINARY_OUT}
OUTPUT ${GEODE_CODEGEN_OUT_FILES}
)
Expand Down
Loading

0 comments on commit c8f15d3

Please sign in to comment.