diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2012-07-28 11:49:35 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2012-07-28 11:49:35 -0400 |
| commit | 70e8b1dcb6524b4f12c41ef8b5834884327b0923 (patch) | |
| tree | 0baedf5a18c5e83dadf23fc1e8226e6be2ab500d /src | |
| parent | fc499d831ea81a0c3d4ef6e6afc13a238955d609 (diff) | |
| download | textadept-70e8b1dcb6524b4f12c41ef8b5834884327b0923.tar.gz textadept-70e8b1dcb6524b4f12c41ef8b5834884327b0923.zip | |
Like for OSX and Win32, use any pre-built LuaJIT archives on Linux; src/Makefile
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index 4908cb26..78325cd8 100644 --- a/src/Makefile +++ b/src/Makefile @@ -81,7 +81,11 @@ ifneq (, $(or $(findstring Linux, $(kernel)), $(findstring BSD, $(kernel)))) plat_flag = -DNCURSES ncurses_lib = -lncursesw endif - libluajit = libluajit.a + ifeq (x86_64, $(shell uname -i)) + libluajit = libluajit.a + else ifeq (i386, $(shell uname -i)) + libluajit = libluajit32.a + endif luadoc = luadoc endif @@ -173,7 +177,7 @@ osx-ncurses: textadept-ncurses.osx textadeptjit-ncurses.osx tmp: rm -rf /tmp/tabuild && hg clone ../ /tmp/tabuild cp -rL ../Doxyfile ../doc ../lexers ../modules /tmp/tabuild/ - cp -r gtdialog gtkosx LexLPeg.cxx libluajit.osx.a lua luajit lua51.dll \ + cp -r gtdialog gtkosx LexLPeg.cxx libluajit*.a lua luajit lua51.dll \ scintilla termkey cdk win32gtk /tmp/tabuild/src/ cd /tmp/tabuild/src/luajit && $(MAKE) clean ln -s `pwd`/../releases /tmp/tabuild @@ -220,6 +224,9 @@ $(luajit_objs): lua/src/lib/*.c libluajit.a: cd luajit && $(MAKE) CC="$(CC) $(CFLAGS)" cp luajit/src/$@ . +libluajit32.a: + cd luajit && $(MAKE) CC="$(CC) -m32 $(CFLAGS)" + cp luajit/src/libluajit.a $@ lua51.dll: cd luajit && $(MAKE) HOST_CC="$(CC) -m32" CROSS=$(CROSS) TARGET_SYS=Windows cp luajit/src/$@ . |