diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2011-12-12 08:08:18 -0500 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2011-12-12 08:08:18 -0500 |
| commit | 51bfd53e48d5310eb786069b758e0430129daf54 (patch) | |
| tree | 15eedf68fad753b1fad5184c4d018bfced1e4001 /src/Makefile | |
| parent | dfacbd6a183f6b09498f589e20f146cbbf332e88 (diff) | |
| download | textadept-51bfd53e48d5310eb786069b758e0430129daf54.tar.gz textadept-51bfd53e48d5310eb786069b758e0430129daf54.zip | |
Updated to Lua 5.2.
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/Makefile b/src/Makefile index b326db63..333fb838 100644 --- a/src/Makefile +++ b/src/Makefile @@ -13,9 +13,7 @@ else PLAT_FLAGS = -DGTK -D__BSD__ endif SCI_THREAD_FLAG = -#LUA_CFLAGS = -DLUA_USE_LINUX -#Lua Coco needs the following flags because GCC is stupid. -LUA_CFLAGS = -DLUA_USE_LINUX -fomit-frame-pointer -maccumulate-outgoing-args +LUA_CFLAGS = -DLUA_USE_LINUX TEXTADEPT = textadept TEXTADEPT_RC = EXPORTLUASYMS = -rdynamic -Wl,--retain-symbols-file -Wl,lua.sym @@ -30,8 +28,7 @@ PKG_CONFIG = pkg-config --define-variable=prefix=win32gtk PKG_CONFIG_PATH = $(shell pwd)/win32gtk/lib/pkgconfig PLAT_FLAGS = -DGTK -D__WIN32__ SCI_THREAD_FLAG = -DG_THREADS_IMPL_NONE -#LUA_CFLAGS = -D_WIN32 -DWIN32 -LUA_CFLAGS = -D_WIN32 -DWIN32 -fomit-frame-pointer -maccumulate-outgoing-args +LUA_CFLAGS = -D_WIN32 -DWIN32 TEXTADEPT = textadept.exe TEXTADEPT_RC = textadept_rc.o EXPORTLUASYMS = -Wl,--retain-symbols-file -Wl,lua.sym @@ -62,7 +59,7 @@ DEBUG_FLAG = -DNDEBUG else DEBUG_FLAG = -DDEBUG -DTRACE -g endif -INCLUDEDIRS = -Iscintilla/include -Ilua/include -Igcocoadialog +INCLUDEDIRS = -Iscintilla/include -Ilua/src -Igcocoadialog ifdef GTK3 GTKVERSION = gtk+-3.0 @@ -86,12 +83,12 @@ GTKLIBS += -framework Carbon -framework Cocoa -ligemacintegration endif TEXTADEPT_OBJS = textadept.o -LUA_OBJS = lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ - lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o \ - lvm.o lzio.o \ - lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o ltablib.o lstrlib.o \ - loadlib.o loslib.o linit.o \ - lpeg.o lfs.o lcoco.o +LUA_OBJS = lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o \ + linit.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o \ + ltable.o ltm.o lundump.o lvm.o lzio.o \ + lauxlib.o lbaselib.o lbitlib.o lcorolib.o ldblib.o liolib.o lmathlib.o \ + loadlib.o loslib.o ltablib.o lstrlib.o \ + lpeg.o lfs.o GCOCOADIALOG = gcocoadialog.o # Scintilla |