Browse Source

app_sqlang: updates to the build system for sqlang libs

Daniel-Constantin Mierla 8 years ago
parent
commit
69ba762794

+ 4 - 2
src/modules/app_sqlang/Makefile

@@ -20,9 +20,11 @@ endif
 include ../../Makefile.modules
 
 libsquirrel.a:
-	make -C ./squirrel/squirrel $(MKSQLANG)
+	make -C ./squirrel/squirrel CC_EXTRA_FLAGS="-fPIC" \
+		OUT="../../libsquirrel.a" $(MKSQLANG)
 
 libsqstdlib.a:
-	make -C ./squirrel/sqstdlib $(MKSQLANG)
+	make -C ./squirrel/sqstdlib CC_EXTRA_FLAGS="-fPIC" \
+		OUT="../../libsqstdlib.a" $(MKSQLANG)
 
 app_sqlang.so: libsquirrel.a libsqstdlib.a

+ 7 - 6
src/modules/app_sqlang/squirrel/sqstdlib/Makefile

@@ -1,8 +1,9 @@
 SQUIRREL= ..
-LPATH ?= ..
 
-OUT= $(SQUIRREL)/$(LPATH)/libsqstdlib.a
-INCZ= -I$(SQUIRREL)/include -I. -Iinclude
+OUT?= $(SQUIRREL)/lib/libsqstdlib.a
+INCZ?= -I$(SQUIRREL)/include -I. -Iinclude
+DEFS= $(CC_EXTRA_FLAGS)
+LIB=
 
 OBJS= \
 	sqstdblob.o \
@@ -26,16 +27,16 @@ SRCS= \
 
 
 sq32:
-	gcc -O2 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ)
+	gcc -O2 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS)
 	ar rc $(OUT) *.o
 	rm *.o
 
 sqprof:
-	gcc -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ)
+	gcc -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS)
 	ar rc $(OUT) *.o
 	rm *.o
 
 sq64:
-	gcc -O2 -m64 -fno-exceptions -fPIC -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ)
+	gcc -O2 -m64 -fno-exceptions -fPIC -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS)
 	ar rc $(OUT) *.o
 	rm *.o

+ 3 - 4
src/modules/app_sqlang/squirrel/squirrel/Makefile

@@ -1,9 +1,8 @@
 SQUIRREL= ..
-LPATH ?= ..
 
-OUT= $(SQUIRREL)/$(LPATH)/libsquirrel.a
-INCZ= -I$(SQUIRREL)/include -I. -Iinclude
-DEFS=
+OUT?= $(SQUIRREL)/lib/libsquirrel.a
+INCZ?= -I$(SQUIRREL)/include -I. -Iinclude
+DEFS= $(CC_EXTRA_FLAGS)
 LIB=
 
 OBJS= \