mirror of
https://github.com/sigmasternchen/CShore
synced 2025-03-15 08:08:56 +00:00
updated json lib / changed to libargo
This commit is contained in:
parent
92798cb6c9
commit
ff8d1caddc
4 changed files with 9 additions and 9 deletions
6
.gitmodules
vendored
6
.gitmodules
vendored
|
@ -1,6 +1,6 @@
|
|||
[submodule "CFloor"]
|
||||
path = CFloor
|
||||
url = git@github.com:overflowerror/CFloor.git
|
||||
[submodule "Cson"]
|
||||
path = Cson
|
||||
url = git@github.com:overflowerror/Cson.git
|
||||
[submodule "libargo"]
|
||||
path = libargo
|
||||
url = git@github.com:overflowerror/libargo.git
|
||||
|
|
1
Cson
1
Cson
|
@ -1 +0,0 @@
|
|||
Subproject commit 2b98752e50034df607b1669d960ffc830906cd9d
|
10
Makefile
10
Makefile
|
@ -1,11 +1,11 @@
|
|||
CC = gcc
|
||||
LD = gcc
|
||||
CFLAGS = -Wall -g -std=c99 -ICFloor/src/ -ICson/src/ -D_POSIX_SOURCE -D_XOPEN_SOURCE=500
|
||||
CFLAGS = -Wall -g -std=c99 -ICFloor/src/ -Ilibargo/src/ -D_POSIX_SOURCE -D_XOPEN_SOURCE=500
|
||||
LDFLAGS = -lpthread -lrt
|
||||
|
||||
CFLOOR_LIB = CFloor/libcfloor.a
|
||||
CSON_LIB = Cson/libcson.a
|
||||
LIBS = $(CFLOOR_LIB) $(CSON_LIB)
|
||||
LIBARGO = Cson/libargo.a
|
||||
LIBS = $(CFLOOR_LIB) $(LIBARGO)
|
||||
|
||||
OBJS = obj/router.o obj/request.o obj/base_cfloor.o obj/base_cgi.o
|
||||
DEPS = $(OBJS:%.o=%.d)
|
||||
|
@ -38,8 +38,8 @@ standalone: $(DEMO_OBJS) $(OBJS) $(LIBS)
|
|||
$(CFLOOR_LIB):
|
||||
$(MAKE) -C CFloor/ libcfloor.a
|
||||
|
||||
$(CSON_LIB):
|
||||
$(MAKE) -C Cson/ libcson.a
|
||||
$(LIBARGO):
|
||||
$(MAKE) -C Cson/ libargo.a
|
||||
|
||||
-include $(DEPS)
|
||||
|
||||
|
|
1
libargo
Submodule
1
libargo
Submodule
|
@ -0,0 +1 @@
|
|||
Subproject commit deb1bde4c4c52e49ad7927c7bd12cc9025a26896
|
Loading…
Reference in a new issue