Fix git conflict on 3rd-party mruby submodule #4
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Restore wren Restore zlib
The attributes were somehow lost
MIPS EABI that is used for i.a. psp doesn't support PIC, so we need to disable it when compiling PSP version
Fix resulting name for libretro emscripten variant
Allow overriding CMAKE_POSITION_INDEPENDENT_CODE from command line
Make merge_static.sh executable
* ignore plist generated from macosx build * fix console and editor scroll limit when caps lock is on * more precise variable name
This reverts commit fe76c4f. It was bad idea to store lua context as static variable.
Split up 3rd-party submodule into individual vendor submodules
|
Sorry for the delay, I have quite a lot of work to do recently 🙇♂️ |
No worries! Stay safe!!! ❤️ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The 3rd-party submodule tree was split into individual submodules so that we can now bring the mruby submodule directly in.