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

fix reference to macos.mm #1953

Closed
wants to merge 32 commits into from
Closed

fix reference to macos.mm #1953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
fa9978e
Use Ubuntu 20.04 for Linux build.
MikuAuahDark Sep 24, 2022
544bba8
Update GitHub Actions dependencies.
MikuAuahDark Apr 15, 2023
c849f71
Artifact AppImage debug symbols.
MikuAuahDark Apr 15, 2023
78e7c44
update version
slime73 Apr 15, 2023
4ab9a1c
Workaround alignment issue in Linux 32-bit platforms.
MikuAuahDark Apr 19, 2023
7828d1e
Fix macOS colorspace backport
slime73 Apr 24, 2023
39763bb
Retry make getdeps 250 times.
MikuAuahDark Apr 26, 2023
0768583
Merge branch 'workaround_32bitalign'
MikuAuahDark May 3, 2023
c8e7d4e
Change the usage of constexpr to const.
MikuAuahDark May 3, 2023
efc54d5
Add PHYSFS_Io StripSuffixIo to skip codesign signatures
pfirsich May 17, 2023
f2ff90c
Workaround alignment issue in ENet on 32-bit platforms.
MikuAuahDark May 23, 2023
f7432bd
Swap alignment workaround from processor to ternary operator.
MikuAuahDark May 23, 2023
4cd0bc0
Improve full-lightuserdata check on 32-bit platforms.
MikuAuahDark May 23, 2023
f1a5e47
Fix/improve MD5 hashing.
ImagicTheCat May 24, 2023
4304132
Fix/improve SHA1 hashing.
ImagicTheCat May 24, 2023
ade3820
Fix/improve SHA-224/256 hashing.
ImagicTheCat May 24, 2023
22e6886
Fix/improve SHA-384/512 hashing.
ImagicTheCat May 24, 2023
a161207
update PhysFS to 3.2.0.
slime73 May 28, 2023
6cc188b
Merge pull request #1930 from pfirsich/physfs_skip_codesign
slime73 May 29, 2023
5f733ef
Add new PhysfsIo file to xcode project
slime73 May 29, 2023
63f0af8
Merge pull request #1935 from ImagicTheCat/hash-func-fix
slime73 May 29, 2023
93c2709
Maybe fix build when VS2013 is used
slime73 May 29, 2023
e9c564e
Use new PhysfsIo class for Android AAsset wrapper.
MikuAuahDark Jun 1, 2023
e559fd5
Pass pointer of PHYSFS_AndroidInit struct in Android when initializin…
MikuAuahDark Jun 1, 2023
ec0c656
Fix #1943 duplicate frames being skipped when decoding Theora
Jun 15, 2023
f06d6c6
Only add platform field to love.joystick.getGamepadMappingString's re…
slime73 Jun 17, 2023
df7a559
Fix love.joystick.setGamepadMapping breaking the mapping string when …
slime73 Jun 18, 2023
241378e
Revert to old packetin loop, set granulePosition after each packet re…
Jun 18, 2023
5f4f0b4
love.joystick: more fixes for duplicate platform fields in gamepad ma…
slime73 Jun 18, 2023
6563aec
Merge pull request #1944 from MellowArpeggiation/main
slime73 Jun 18, 2023
e582677
Fix mouse position backward compatibility with new SDL2 versions.
slime73 Jul 1, 2023
fa7de38
fix reference to macos.mm
hgoschuetz Jul 10, 2023
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
41 changes: 28 additions & 13 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on: [push, pull_request]

jobs:
linux-os:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Update APT
run: sudo apt-get update
Expand All @@ -17,36 +17,51 @@ jobs:
libegl1-mesa-dev libibus-1.0-dev fcitx-libs-dev libsamplerate0-dev \
libsndio-dev libwayland-dev libxkbcommon-dev libdrm-dev libgbm-dev
- name: Checkout love-appimage-source
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: love2d/love-appimage-source
- name: Checkout LÖVE
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
path: love2d-${{ github.sha }}
- name: Get Dependencies for AppImage
shell: python
env:
LOVE_BRANCH: ${{ github.sha }}
run: |
import os
for i in range(250):
if os.system(f"make getdeps LOVE_BRANCH={os.environ['LOVE_BRANCH']}") == 0:
raise SystemExit(0)
raise Exception("make getdeps failed")
- name: Build AppImage
run: make LOVE_BRANCH=${{ github.sha }}
- name: Print LuaJIT branch
run: git -C LuaJIT-v2.1 branch -v
- name: Artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: love-x86_64.AppImage
path: love-${{ github.sha }}.AppImage
- name: Artifact Debug Symbols
uses: actions/upload-artifact@v3
with:
name: love-x86_64-AppImage-debug
path: love-${{ github.sha }}.AppImage-debug.tar.gz
windows-os:
runs-on: windows-latest
strategy:
matrix:
platform: [Win32, x64]
steps:
- name: Clone Megasource
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
path: megasource
repository: love2d/megasource
ref: main
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
path: megasource/libs/love
- name: Configure
Expand All @@ -58,22 +73,22 @@ jobs:
shell: cmd
run: cmake --build build --config Release --target install -j2
- name: Artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: love-windows-${{ matrix.platform }}
path: install
- name: Artifact JIT Modules
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: love-windows-jitmodules-${{ matrix.platform }}
path: build/libs/LuaJIT/src/jit/*.lua
macOS:
runs-on: macos-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Clone Dependencies
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
path: apple-dependencies
repository: love2d/love-apple-dependencies
Expand All @@ -91,17 +106,17 @@ jobs:
run:
ditto -c -k --sequesterRsrc --keepParent love-macos/love.app love-macos.zip
- name: Artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: love-macos
path: love-macos.zip
iOS-Simulator:
runs-on: macos-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Clone Dependencies
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
path: apple-dependencies
repository: love2d/love-apple-dependencies
Expand Down
4 changes: 3 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ set(LOVE_SRC_COMMON

if (APPLE)
set(LOVE_SRC_COMMON ${LOVE_SRC_COMMON}
src/common/macosx.mm
src/common/macos.mm
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is still macosx.mm in the main branch, it's only renamed to macos.mm in 12.0-development. Did you mean to make the PR based against that branch instead of main?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I did. Sorry for the inconvenience.

)
set(LOVE_LINK_LIBRARIES ${LOVE_LINK_LIBRARIES} objc)
set(LOVE_LINK_LIBRARIES ${LOVE_LINK_LIBRARIES} "-framework CoreFoundation")
Expand Down Expand Up @@ -477,6 +477,8 @@ set(LOVE_SRC_MODULE_FILESYSTEM_PHYSFS
src/modules/filesystem/physfs/File.h
src/modules/filesystem/physfs/Filesystem.cpp
src/modules/filesystem/physfs/Filesystem.h
src/modules/filesystem/physfs/PhysfsIo.h
src/modules/filesystem/physfs/PhysfsIo.cpp
)

set(LOVE_SRC_MODULE_FILESYSTEM
Expand Down
2 changes: 1 addition & 1 deletion extra/appveyor/appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 11.4.{build}
version: 11.5.{build}

image: Visual Studio 2013

Expand Down
Binary file modified extra/windows/love.rc
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion platform/unix/configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AC_INIT([love], [11.4])
AC_INIT([love], [11.5])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR([platform/unix])
AC_CONFIG_MACRO_DIR([platform/unix/m4])
Expand Down
2 changes: 1 addition & 1 deletion platform/unix/love.6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
.\" 3. This notice may not be removed or altered from any source distribution.
.Dd March 31, 2018
.Dt LOVE 6
.Os LÖVE 11.4
.Os LÖVE 11.5
.Sh NAME
.Nm love
.Nd 2D game development framework
Expand Down
16 changes: 13 additions & 3 deletions platform/xcode/liblove.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@
217DFC101D9F6D490055D849 /* url.lua.h in Headers */ = {isa = PBXBuildFile; fileRef = 217DFBD41D9F6D490055D849 /* url.lua.h */; };
217DFC111D9F6D490055D849 /* usocket.c in Sources */ = {isa = PBXBuildFile; fileRef = 217DFBD51D9F6D490055D849 /* usocket.c */; };
217DFC121D9F6D490055D849 /* usocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 217DFBD61D9F6D490055D849 /* usocket.h */; };
D943E58E2A24D56000D80361 /* PhysfsIo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D943E58C2A24D56000D80361 /* PhysfsIo.cpp */; };
D943E58F2A24D56000D80361 /* PhysfsIo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D943E58C2A24D56000D80361 /* PhysfsIo.cpp */; };
D943E5902A24D56000D80361 /* PhysfsIo.h in Headers */ = {isa = PBXBuildFile; fileRef = D943E58D2A24D56000D80361 /* PhysfsIo.h */; };
FA0A3A5F23366CE9001C269E /* floattypes.h in Headers */ = {isa = PBXBuildFile; fileRef = FA0A3A5D23366CE9001C269E /* floattypes.h */; };
FA0A3A6023366CE9001C269E /* floattypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA0A3A5E23366CE9001C269E /* floattypes.cpp */; };
FA0A3A6123366CE9001C269E /* floattypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA0A3A5E23366CE9001C269E /* floattypes.cpp */; };
Expand Down Expand Up @@ -1267,6 +1270,8 @@
217DFBD41D9F6D490055D849 /* url.lua.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = url.lua.h; sourceTree = "<group>"; };
217DFBD51D9F6D490055D849 /* usocket.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = usocket.c; sourceTree = "<group>"; };
217DFBD61D9F6D490055D849 /* usocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = usocket.h; sourceTree = "<group>"; };
D943E58C2A24D56000D80361 /* PhysfsIo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PhysfsIo.cpp; sourceTree = "<group>"; };
D943E58D2A24D56000D80361 /* PhysfsIo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhysfsIo.h; sourceTree = "<group>"; };
FA08F5AE16C7525600F007B5 /* liblove-macosx.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "liblove-macosx.plist"; path = "macosx/liblove-macosx.plist"; sourceTree = "<group>"; };
FA0A3A5D23366CE9001C269E /* floattypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = floattypes.h; sourceTree = "<group>"; };
FA0A3A5E23366CE9001C269E /* floattypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = floattypes.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2719,6 +2724,8 @@
FA0B7B651A95902C000E1D17 /* File.h */,
FA0B7B661A95902C000E1D17 /* Filesystem.cpp */,
FA0B7B671A95902C000E1D17 /* Filesystem.h */,
D943E58C2A24D56000D80361 /* PhysfsIo.cpp */,
D943E58D2A24D56000D80361 /* PhysfsIo.h */,
);
path = physfs;
sourceTree = "<group>";
Expand Down Expand Up @@ -3815,6 +3822,7 @@
FA0B7EEA1A95902D000E1D17 /* wrap_Window.h in Headers */,
FA1557C01CE90A2C00AFF582 /* tinyexr.h in Headers */,
FA0B7E381A95902C000E1D17 /* WheelJoint.h in Headers */,
D943E5902A24D56000D80361 /* PhysfsIo.h in Headers */,
FA0B7D851A95902C000E1D17 /* Image.h in Headers */,
FA0B7E7D1A95902C000E1D17 /* wrap_World.h in Headers */,
FA0B7EBD1A95902C000E1D17 /* LuaThread.h in Headers */,
Expand Down Expand Up @@ -4265,6 +4273,7 @@
FA0B7E161A95902C000E1D17 /* Joint.cpp in Sources */,
FA0B7EE91A95902D000E1D17 /* wrap_Window.cpp in Sources */,
FA1583E21E196180005E603B /* wrap_Shader.cpp in Sources */,
D943E58F2A24D56000D80361 /* PhysfsIo.cpp in Sources */,
FA0B7AB91A958EA3000E1D17 /* enet.cpp in Sources */,
FA0B7E281A95902C000E1D17 /* PulleyJoint.cpp in Sources */,
FA56AA391FAFF02000A43D5F /* memory.cpp in Sources */,
Expand Down Expand Up @@ -4656,6 +4665,7 @@
FAF140A01E20934C00F898D2 /* RemoveTree.cpp in Sources */,
FA0B7E151A95902C000E1D17 /* Joint.cpp in Sources */,
FA0B7EE81A95902D000E1D17 /* wrap_Window.cpp in Sources */,
D943E58E2A24D56000D80361 /* PhysfsIo.cpp in Sources */,
FA0B7E271A95902C000E1D17 /* PulleyJoint.cpp in Sources */,
FA1BA0B71E17043400AA2803 /* wrap_Shader.cpp in Sources */,
FA0B7B301A958EA3000E1D17 /* wuff.c in Sources */,
Expand Down Expand Up @@ -5194,7 +5204,7 @@
INFOPLIST_FILE = "macosx/liblove-macosx.plist";
LD_DYLIB_INSTALL_NAME = "@rpath/$(EXECUTABLE_PATH)";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../../";
MARKETING_VERSION = 11.4;
MARKETING_VERSION = 11.5;
OTHER_LDFLAGS = (
"-undefined",
dynamic_lookup,
Expand Down Expand Up @@ -5230,7 +5240,7 @@
INFOPLIST_FILE = "macosx/liblove-macosx.plist";
LD_DYLIB_INSTALL_NAME = "@rpath/$(EXECUTABLE_PATH)";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../../";
MARKETING_VERSION = 11.4;
MARKETING_VERSION = 11.5;
OTHER_LDFLAGS = (
"-undefined",
dynamic_lookup,
Expand Down Expand Up @@ -5267,7 +5277,7 @@
INFOPLIST_FILE = "macosx/liblove-macosx.plist";
LD_DYLIB_INSTALL_NAME = "@rpath/$(EXECUTABLE_PATH)";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../../";
MARKETING_VERSION = 11.4;
MARKETING_VERSION = 11.5;
OTHER_LDFLAGS = (
"-undefined",
dynamic_lookup,
Expand Down
12 changes: 6 additions & 6 deletions platform/xcode/love.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MARKETING_VERSION = 11.4;
MARKETING_VERSION = 11.5;
PRODUCT_BUNDLE_IDENTIFIER = org.love2d.love;
PRODUCT_NAME = love;
};
Expand Down Expand Up @@ -496,7 +496,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MARKETING_VERSION = 11.4;
MARKETING_VERSION = 11.5;
PRODUCT_BUNDLE_IDENTIFIER = org.love2d.love;
PRODUCT_NAME = love;
};
Expand Down Expand Up @@ -697,7 +697,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 11.4;
MARKETING_VERSION = 11.5;
MTL_ENABLE_DEBUG_INFO = YES;
PRODUCT_BUNDLE_IDENTIFIER = org.love2d.love;
PRODUCT_NAME = love;
Expand Down Expand Up @@ -747,7 +747,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 11.4;
MARKETING_VERSION = 11.5;
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = org.love2d.love;
PRODUCT_NAME = love;
Expand Down Expand Up @@ -798,7 +798,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 11.4;
MARKETING_VERSION = 11.5;
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = org.love2d.love;
PRODUCT_NAME = love;
Expand Down Expand Up @@ -912,7 +912,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MARKETING_VERSION = 11.4;
MARKETING_VERSION = 11.5;
PRODUCT_BUNDLE_IDENTIFIER = org.love2d.love;
PRODUCT_NAME = love;
};
Expand Down
Loading