64 lines
1.6 KiB
Diff
64 lines
1.6 KiB
Diff
From 9a0d88e7f9e865c07dbad122bfdeb5e510140d07 Mon Sep 17 00:00:00 2001
|
|
Date: Mon, 19 Jun 2017 17:16:25 +0300
|
|
Subject: переопределение CC AR RANLIB и линковка динамической библиотеки
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
---
|
|
src/Makefile | 14 +++++++++-----
|
|
1 file changed, 9 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/src/Makefile b/src/Makefile
|
|
index e0d4c9f..7e51c23 100644
|
|
--- a/src/Makefile
|
|
+++ b/src/Makefile
|
|
@@ -7,10 +7,10 @@
|
|
# Your platform. See PLATS for possible values.
|
|
PLAT= none
|
|
|
|
-CC= gcc
|
|
+CC?= gcc
|
|
CFLAGS= -O2 -Wall $(MYCFLAGS)
|
|
-AR= ar rcu
|
|
-RANLIB= ranlib
|
|
+AR?= ar rcu
|
|
+RANLIB?= ranlib
|
|
RM= rm -f
|
|
LIBS= -lm $(MYLIBS)
|
|
|
|
@@ -23,6 +23,7 @@ MYLIBS=
|
|
PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
|
|
|
|
LUA_A= liblua.a
|
|
+LUA_SO= liblua.so
|
|
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
|
|
@@ -36,7 +37,7 @@ LUAC_T= luac
|
|
LUAC_O= luac.o print.o
|
|
|
|
ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
|
|
-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
|
|
+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
|
|
ALL_A= $(LUA_A)
|
|
|
|
default: $(PLAT)
|
|
@@ -48,9 +49,12 @@ o: $(ALL_O)
|
|
a: $(ALL_A)
|
|
|
|
$(LUA_A): $(CORE_O) $(LIB_O)
|
|
- $(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files
|
|
+ $(AR) rcu $@ $(CORE_O) $(LIB_O) # DLL needs all object files
|
|
$(RANLIB) $@
|
|
|
|
+$(LUA_SO): $(CORE_O) $(LIB_O)
|
|
+ $(CC) -o $@ -shared $?
|
|
+
|
|
$(LUA_T): $(LUA_O) $(LUA_A)
|
|
$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
|
|
|
|
--
|
|
2.16.4
|
|
|