Luke Granger-Brown
57725ef3ec
git-subtree-dir: third_party/nixpkgs git-subtree-split: 76612b17c0ce71689921ca12d9ffdc9c23ce40b2
52 lines
1.7 KiB
Diff
52 lines
1.7 KiB
Diff
diff --git a/Makefile b/Makefile
|
|
index 209a132..9387b09 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -43,7 +43,7 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
|
|
# What to install.
|
|
TO_BIN= lua luac
|
|
TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
|
|
-TO_LIB= liblua.a
|
|
+TO_LIB= liblua.5.1.5.dylib
|
|
TO_MAN= lua.1 luac.1
|
|
|
|
# Lua version and release.
|
|
@@ -64,6 +64,8 @@ install: dummy
|
|
cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
|
|
cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
|
|
cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
|
|
+ ln -s -f liblua.5.1.5.dylib $(INSTALL_LIB)/liblua.5.1.dylib
|
|
+ ln -s -f liblua.5.1.dylib $(INSTALL_LIB)/liblua.dylib
|
|
|
|
ranlib:
|
|
cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB)
|
|
diff --git a/src/Makefile b/src/Makefile
|
|
index e0d4c9f..4477d7b 100644
|
|
--- a/src/Makefile
|
|
+++ b/src/Makefile
|
|
@@ -22,7 +22,7 @@ MYLIBS=
|
|
|
|
PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
|
|
|
|
-LUA_A= liblua.a
|
|
+LUA_A= liblua.5.1.5.dylib
|
|
CORE_O= 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
|
|
@@ -48,11 +48,13 @@ o: $(ALL_O)
|
|
a: $(ALL_A)
|
|
|
|
$(LUA_A): $(CORE_O) $(LIB_O)
|
|
- $(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files
|
|
- $(RANLIB) $@
|
|
+ $(CC) -dynamiclib -install_name $(out)/lib/liblua.5.1.dylib \
|
|
+ -compatibility_version 5.1 -current_version 5.1.5 \
|
|
+ -o liblua.5.1.5.dylib $^
|
|
|
|
$(LUA_T): $(LUA_O) $(LUA_A)
|
|
- $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
|
|
+ $(CC) -fno-common $(MYLDFLAGS) \
|
|
+ -o $@ $(LUA_O) $(LUA_A) -L. -llua.5.1.5 $(LIBS)
|
|
|
|
$(LUAC_T): $(LUAC_O) $(LUA_A)
|
|
$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
|