Merge branch 'develop' into 'master'

Develop

See merge request !1
This commit is contained in:
Meutel 2017-04-02 20:40:23 +02:00
commit 33fcd63f9e
3 changed files with 16 additions and 2 deletions

14
.gitlab-ci.yml Normal file
View File

@ -0,0 +1,14 @@
stages:
- build
build:
stage: build
script:
- make
artifacts:
paths:
- '*.o'
expire_in: 1 hour
tags:
- kcgi

View File

@ -110,7 +110,7 @@ clean:
-e "s!@CGIURI@!$(CGIURI)!g" $< >$@
$(TARGET): $(OBJS)
$(CC) $(STATIC) -o $@ $(OBJS) externals/ksql.o $(LDFLAGS) -lkcgi -lkcgijson -lz -lsqlite3 -pthread
$(CC) $(STATIC) -o $@ $(OBJS) $(LDFLAGS) -lksql -lkcgi -lkcgijson -lz -lsqlite3 -pthread
$(OBJS): extern.h

2
db.c
View File

@ -24,7 +24,7 @@
#include <kcgi.h>
#include <kcgijson.h>
#include "ksql.h"
#include <ksql.h>
#include "extern.h"