diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2018-03-24 10:00:45 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2018-03-24 10:00:45 -0400 |
| commit | f05a5b7a20a9df50fc8116324fe078ca473343d6 (patch) | |
| tree | 8d9baf4f499433897090bbfd2f6073eeebef2a77 /src | |
| parent | 215797f4739bb151317b0c4eb7899d346a35e3de (diff) | |
| download | textadept-f05a5b7a20a9df50fc8116324fe078ca473343d6.tar.gz textadept-f05a5b7a20a9df50fc8116324fe078ca473343d6.zip | |
Updated to pre-release version of Scintilla 3.8.0.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile index 9c8f9885..27db5e41 100644 --- a/src/Makefile +++ b/src/Makefile @@ -184,12 +184,12 @@ $(luajit_lib_objs): %jit.o: lua/src/lib/%.c $(lua_spawn_objs): lua/src/lib/lspawn.c $(CROSS)$(CC) -c $(CFLAGS) $(LUA_CFLAGS) -std=c99 -pedantic $(spawn_flags) \ $< -o $@ -luajit/src/libluajit.a: ; $(MAKE) -C luajit CC="$(CC) $(CFLAGS)" +luajit/src/libluajit.a: ; $(MAKE) -C luajit CC="$(CC)" CFLAGS="$(CFLAGS)" luajit/src/lua51.dll: $(MAKE) -C luajit HOST_CC="$(CC) -m32" CROSS=$(CROSS) TARGET_SYS=Windows \ TARGET_SHLDFLAGS="-static-libgcc" luajit/src/libluajit.osx.a: - $(MAKE) -C luajit CC="$(CC) -m32" CROSS=$(CROSS) TARGET_SYS=Darwin \ + $(MAKE) -C luajit HOST_CC="$(CC) -m32" CROSS=$(CROSS) TARGET_SYS=Darwin \ LUAJIT_A=$(notdir $@) || return 0 $(gtdialog_objs): gtdialog/gtdialog.c $(CROSS)$(CC) -c $(CFLAGS) -std=c99 -pedantic $(plat_flag) -DNOHELP \ @@ -401,12 +401,14 @@ else lspawn_url = http://foicica.com/hg/lspawn/archive/tip.zip endif -scintilla_zip = d9f1d7450ec2.zip +scintilla_zip = 80bcec2634db.zip lua_tgz = lua-5.3.4.tar.gz lpeg_tgz = lpeg-1.0.0.tar.gz lfs_zip = v_1_6_3.zip lspawn_zip = 9a8b4b5e4137.zip luajit_tgz = LuaJIT-2.0.3.tar.gz +# Needed since LuaJIT will not cross-compile from x86 to x64 due to pointer size +# mismatch. libluajit_tgz = libluajit_2.0.3.x86_64.tgz gtdialog_zip = 6435a42450c7.zip cdk_tgz = cdk-5.0-20150928.tgz |