diff options
| author |  mitchell <70453897+667e-11@users.noreply.github.com> | 2014-05-10 16:10:05 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2014-05-10 16:10:05 -0400 |
| commit | f35bab15d62ed798eb68ac69b439e2198c8fad31 (patch) | |
| tree | 4eefcc87a65bc71823fb865b5f48b2db5fca0129 /src | |
| parent | 2ad637aea5c47e8201e9bbe32e1faa8c933c0cf9 (diff) | |
Fixed bug in exporting Lua symbols on Windows.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 39 | ||||
| -rw-r--r-- | src/lua.sym | 2 |
2 files changed, 23 insertions, 18 deletions
diff --git a/src/Makefile b/src/Makefile index 6d4dc333..559eb546 100644 --- a/src/Makefile +++ b/src/Makefile @@ -17,6 +17,7 @@ ifneq (, $(or $(findstring Linux, $(kernel)), $(findstring BSD, $(kernel)))) CFLAGS = -mms-bitfields CXX = g++ CXXFLAGS = -mms-bitfields -static-libgcc -static-libstdc++ + LUA_CFLAGS = -DLUA_BUILD_AS_DLL LDFLAGS = -Wl,--retain-symbols-file -Wl,lua.sym ifeq (, $(findstring curses, $(MAKECMDGOALS))) CXXFLAGS += -mwindows @@ -41,6 +42,7 @@ ifneq (, $(or $(findstring Linux, $(kernel)), $(findstring BSD, $(kernel)))) CURSES_CFLAGS = -DLIBICONV_STATIC -I$(arch)curses/include CURSES_LIBS = $(arch)curses/lib/pdcurses.a $(arch)curses/lib/libiconv.a endif + lua_api = -DLUA_LIB luadoc = luadoc_start.bat else ifeq (osx, $(findstring osx, $(MAKECMDGOALS))) @@ -170,7 +172,7 @@ sci_gtk_objs = PlatGTK.o ScintillaGTK.o # Textadept. ta_flags = -std=c99 -O -D_POSIX_C_SOURCE=200809L -D_DARWIN_C_SOURCE \ - $(plat_flag) -Iscintilla/include -Igtdialog -W -Wall \ + $(plat_flag) $(lua_api) -Iscintilla/include -Igtdialog -W -Wall \ -Wno-sign-compare -Wno-unused ifndef NO_SINGLE_INSTANCE # Single instance unless NO_SINGLE_INSTANCE=1 @@ -230,34 +232,37 @@ ScintillaTerm.o: scintilla/term/ScintillaTerm.cxx $(CROSS)$(CXX) -c $(CXXFLAGS) $(sci_flags) -Iscintilla/term $(CURSES_CFLAGS) \ $< -o $@ LexLPeg.o: LexLPeg.cxx - $(CROSS)$(CXX) -c $(CXXFLAGS) $(LUA_CFLAGS) $(sci_flags) -DLPEG_LEXER \ - -DNO_SCITE -Ilua/src $< -o $@ + $(CROSS)$(CXX) -c $(CXXFLAGS) $(LUA_CFLAGS) $(sci_flags) $(lua_api) \ + -DLPEG_LEXER -DNO_SCITE -Ilua/src $< -o $@ LexLPegjit.o: LexLPeg.cxx - $(CROSS)$(CXX) -c $(CXXFLAGS) $(LUA_CFLAGS) $(sci_flags) -DLPEG_LEXER \ - -DNO_SCITE -Iluajit/src $< -o $@ + $(CROSS)$(CXX) -c $(CXXFLAGS) $(LUA_CFLAGS) $(sci_flags) $(lua_api) \ + -DLPEG_LEXER -DNO_SCITE -Iluajit/src $< -o $@ LexLPeg-curses.o: LexLPeg.cxx - $(CROSS)$(CXX) -c $(CXXFLAGS) $(LUA_CFLAGS) $(sci_flags) -DLPEG_LEXER \ - -DNO_SCITE -DCURSES -Ilua/src $(CURSES_CFLAGS) $< -o $@ + $(CROSS)$(CXX) -c $(CXXFLAGS) $(LUA_CFLAGS) $(sci_flags) $(lua_api) \ + -DLPEG_LEXER -DNO_SCITE -DCURSES -Ilua/src $(CURSES_CFLAGS) $< -o $@ LexLPegjit-curses.o: LexLPeg.cxx - $(CROSS)$(CXX) -c $(CXXFLAGS) $(LUA_CFLAGS) $(sci_flags) -DLPEG_LEXER \ - -DNO_SCITE -DCURSES -Iluajit/src $(CURSES_CFLAGS) $< -o $@ + $(CROSS)$(CXX) -c $(CXXFLAGS) $(LUA_CFLAGS) $(sci_flags) $(lua_api) \ + -DLPEG_LEXER -DNO_SCITE -DCURSES -Iluajit/src $(CURSES_CFLAGS) $< -o $@ textadept.o: textadept.c - $(CROSS)$(CC) -c $(CFLAGS) $(ta_flags) -Ilua/src $(GTK_CFLAGS) $< -o $@ -textadeptjit.o: textadept.c - $(CROSS)$(CC) -c $(CFLAGS) $(ta_flags) -DLUAJIT -Iluajit/src $(GTK_CFLAGS) \ + $(CROSS)$(CC) -c $(CFLAGS) $(LUA_CFLAGS) $(ta_flags) -Ilua/src $(GTK_CFLAGS) \ $< -o $@ +textadeptjit.o: textadept.c + $(CROSS)$(CC) -c $(CFLAGS) $(LUA_CFLAGS) $(ta_flags) -DLUAJIT -Iluajit/src \ + $(GTK_CFLAGS) $< -o $@ textadept-curses.o: textadept.c - $(CROSS)$(CC) -c $(CFLAGS) $(ta_flags) -Ilua/src -Iscintilla/term -Itermkey \ - -Iwindowman -Icdk $(CURSES_CFLAGS) $< -o $@ + $(CROSS)$(CC) -c $(CFLAGS) $(LUA_CFLAGS) $(ta_flags) -Ilua/src \ + -Iscintilla/term -Itermkey -Iwindowman -Icdk $(CURSES_CFLAGS) $< -o $@ textadeptjit-curses.o: textadept.c - $(CROSS)$(CC) -c $(CFLAGS) $(ta_flags) -DLUAJIT -Iluajit/src \ + $(CROSS)$(CC) -c $(CFLAGS) $(LUA_CFLAGS) $(ta_flags) -DLUAJIT -Iluajit/src \ -Iscintilla/term -Itermkey -Iwindowman -Icdk $(CURSES_CFLAGS) $< -o $@ $(lua_objs): %.o: lua/src/%.c $(CROSS)$(CC) -c $(CFLAGS) $(LUA_CFLAGS) -Ilua/src $< -o $@ $(lua_lib_objs): %.o: lua/src/lib/%.c - $(CROSS)$(CC) -c $(CFLAGS) $(LUA_CFLAGS) -Ilua/src $(GLIB_CFLAGS) $< -o $@ + $(CROSS)$(CC) -c $(CFLAGS) $(LUA_CFLAGS) $(lua_api) -Ilua/src $(GLIB_CFLAGS) \ + $< -o $@ $(luajit_lib_objs): %jit.o: lua/src/lib/%.c - $(CROSS)$(CC) -c $(CFLAGS) $(LUA_CFLAGS) -Iluajit/src $(GLIB_CFLAGS) $< -o $@ + $(CROSS)$(CC) -c $(CFLAGS) $(LUA_CFLAGS) $(lua_api) -Iluajit/src \ + $(GLIB_CFLAGS) $< -o $@ luajit/src/libluajit.a: ; $(MAKE) -C luajit CC="$(CC) $(CFLAGS)" luajit/src/lua51.dll: $(MAKE) -C luajit HOST_CC="$(CC) -m32" CROSS=$(CROSS) TARGET_SYS=Windows diff --git a/src/lua.sym b/src/lua.sym index 5398a9c2..d2a73e4f 100644 --- a/src/lua.sym +++ b/src/lua.sym @@ -36,7 +36,7 @@ luaL_optlstring luaL_optnumber luaL_optunsigned luaL_prepbuffer -luaL_prepbuffersize +luaL_prepbuffsize luaL_pushresult luaL_pushresultsize luaL_ref |