Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
curl -u SignalFromTheStars:${{ secrets.SDK_TOKEN }} -sL https://raw.githubusercontent.com/SignalFromTheStars/private-steamworks-sdk/master/steamworks_sdk_163.zip -o sdk.zip
unzip -q sdk.zip
- name: Build
run: make osx && mkdir -p build && cp luasteam.so build/osx_luasteam.so
run: make osx && mkdir -p build && cp luasteam.so.arm64 build/osx_arm64_luasteam.so && cp luasteam.so.x86_64 build/osx_x86_64_luasteam.so
- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ luajit-osx:
lipo -create -output $(LUAJIT_PATH)/src/luajit $(LUAJIT_PATH)/src/luajit_x86_64 $(LUAJIT_PATH)/src/luajit_arm64

osx: luajit-osx
$(CXX) $(SRC) $(CPP_FLAGS) -arch arm64 ${STEAM_LIB}/osx/libsteam_api.dylib $(LUAJIT_PATH)/src/libluajit.a -o $(OSX_OUT).arm64 -shared -fPIC $(OSX_FLAGS)
$(CXX) $(SRC) $(CPP_FLAGS) -arch x86_64 ${STEAM_LIB}/osx/libsteam_api.dylib $(LUAJIT_PATH)/src/libluajit.a -o $(OSX_OUT).x86_64 -shared -fPIC $(OSX_FLAGS)
$(CXX) $(SRC) $(CPP_FLAGS) -arch arm64 ${STEAM_LIB}/osx/libsteam_api.dylib -undefined dynamic_lookup -o $(OSX_OUT).arm64 -shared -fPIC $(OSX_FLAGS)
$(CXX) $(SRC) $(CPP_FLAGS) -arch x86_64 ${STEAM_LIB}/osx/libsteam_api.dylib -undefined dynamic_lookup -o $(OSX_OUT).x86_64 -shared -fPIC $(OSX_FLAGS)
lipo -create -output $(OSX_OUT) $(OSX_OUT).arm64 $(OSX_OUT).x86_64
codesign -s - $(OSX_OUT)
# Test
Expand Down