Merge remote-tracking branch 'harens/macos-bundle'

This commit is contained in:
Francesco Abbate 2021-08-19 11:32:36 +02:00
commit d9e73a97ea
4 changed files with 12 additions and 4 deletions

View File

@ -5,7 +5,7 @@ keymap.modkeys = {}
keymap.map = {} keymap.map = {}
keymap.reverse_map = {} keymap.reverse_map = {}
local macos = rawget(_G, "MACOS_RESOURCES") local macos = rawget(_G, "MACOS")
-- Thanks to mathewmariani, taken from his lite-macos github repository. -- Thanks to mathewmariani, taken from his lite-macos github repository.
local modkeys_os = require("core.modkeys-" .. (macos and "macos" or "generic")) local modkeys_os = require("core.modkeys-" .. (macos and "macos" or "generic"))

View File

@ -86,7 +86,8 @@ if get_option('portable') or host_machine.system() == 'windows'
lite_bindir = '/' lite_bindir = '/'
lite_docdir = '/doc' lite_docdir = '/doc'
lite_datadir = '/data' lite_datadir = '/data'
elif host_machine.system() == 'darwin' elif get_option('bundle') and host_machine.system() == 'darwin'
lite_cargs += '-DMACOS_USE_BUNDLE'
lite_bindir = 'Contents/MacOS' lite_bindir = 'Contents/MacOS'
lite_docdir = 'Contents/Resources' lite_docdir = 'Contents/Resources'
lite_datadir = 'Contents/Resources' lite_datadir = 'Contents/Resources'

View File

@ -1,2 +1,3 @@
option('bundle', type : 'boolean', value : true, description: 'Build a macOS bundle')
option('portable', type : 'boolean', value : false, description: 'Portable install') option('portable', type : 'boolean', value : false, description: 'Portable install')
option('renderer', type : 'boolean', value : false, description: 'Use SDL renderer') option('renderer', type : 'boolean', value : false, description: 'Use SDL renderer')

View File

@ -78,8 +78,10 @@ static void init_window_icon(void) {
#endif #endif
#ifdef __APPLE__ #ifdef __APPLE__
void set_macos_bundle_resources(lua_State *L);
void enable_momentum_scroll(); void enable_momentum_scroll();
#ifdef MACOS_USE_BUNDLE
void set_macos_bundle_resources(lua_State *L);
#endif
#endif #endif
int main(int argc, char **argv) { int main(int argc, char **argv) {
@ -138,8 +140,12 @@ init_lua:
lua_setglobal(L, "EXEFILE"); lua_setglobal(L, "EXEFILE");
#ifdef __APPLE__ #ifdef __APPLE__
set_macos_bundle_resources(L); lua_pushboolean(L, true);
lua_setglobal(L, "MACOS");
enable_momentum_scroll(); enable_momentum_scroll();
#ifdef MACOS_USE_BUNDLE
set_macos_bundle_resources(L);
#endif
#endif #endif
const char *init_lite_code = \ const char *init_lite_code = \