diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2012-06-29 17:12:49 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2012-06-29 17:12:49 -0400 |
| commit | b8e7462222054f8b256677edf7034197a6ca022b (patch) | |
| tree | 95db4592dd38b3c07c6dee083739d0f6997b0406 | |
| parent | fa2eae091531d5fe23f9cb93cec5471fe5d351df (diff) | |
| download | textadept-b8e7462222054f8b256677edf7034197a6ca022b.tar.gz textadept-b8e7462222054f8b256677edf7034197a6ca022b.zip | |
Correctly cross-compile LuaJIT for Mac OSX.
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | src/Makefile | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d4f09970..caec6257 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ Changes: * Show text that could not be localized. * Changed `make` commands for [compiling][] Textadept. * x86\_64 binary provides `libpng12` executables by default. +* Can cross compile to Mac OSX from Linux. * Updated to [Lua 5.2.1][]. * Updated to [LuaJIT][] 2.0.0-beta10. diff --git a/src/Makefile b/src/Makefile index 18f71e9a..61dd8aa9 100644 --- a/src/Makefile +++ b/src/Makefile @@ -187,12 +187,15 @@ $(lua_objs): lua/src/*.c lua/src/lib/*.c $(luajit_objs): lua/src/lib/*.c $(CROSS)$(CC) -c $(CFLAGS) $(LUAFLAGS) -Iluajit/src $^ for lib in $(luajit_objs); do mv $$(echo $$lib | sed 's/jit//g') $$lib; done -$(libluajit): +libluajit.a: cd luajit && make CC="$(CC) $(CFLAGS)" - cp luajit/src/libluajit.a $@ + cp luajit/src/$@ . lua51.dll: cd luajit && make HOST_CC="$(CC) -m32" CROSS=$(CROSS) TARGET_SYS=Windows cp luajit/src/$@ . +libluajit.osx.a: + cd luajit && make CC="$(CC) -m32" CROSS=$(CROSS) TARGET_SYS=Darwin || return 0 + cp luajit/src/libluajit.a $@ gtdialog.o: gtdialog/gtdialog.c $(CROSS)$(CC) -c $(CFLAGS) -DGTK -DNOHELP -DLIBRARY $(gtk_flags) $< gtdialog-ncurses.o: gtdialog/gtdialog.c |