Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Hopefully fixed travis and make issues
- Loading branch information
Monte Goulding
committed
Oct 8, 2015
1 parent
c703e19
commit 1a971bd
Showing
2 changed files
with
4 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,3 +9,4 @@ addons: | |
| apt: | ||
| packages: | ||
| - libc6-dev-i386 | ||
| - linux-libc-dev | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| all-linux: mergJSON-x86.so mergJSON-x64.so | ||
|
|
||
| mergJSON-x86.so: mergJSON/mergJSON.c mergJSON/external.h mergJSON/external.c mergJSON/jansson/src/dump.c mergJSON/jansson/src/error.c mergJSON/jansson/src/hashtable.c mergJSON/jansson/src/load.c mergJSON/jansson/src/memory.c mergJSON/jansson/src/pack_unpack.c mergJSON/jansson/src/strbuffer.c mergJSON/jansson/src/strconv.c mergJSON/jansson/src/utf.c mergJSON/jansson/src/value.c | ||
| gcc -m32 -O -I. -I mergJSON/jansson/src -L.-D_LINUX -D_RELEASE -DNDEBUG -DRELEASE -Xlinker -no-undefined -fno-exceptions -Wl,-Bstatic -Wl,-Bdynamic -static -shared mergJSON/mergJSON.c mergJSON/external.c mergJSON/jansson/src/dump.c mergJSON/jansson/src/error.c mergJSON/jansson/src/hashtable.c mergJSON/jansson/src/load.c mergJSON/jansson/src/memory.c mergJSON/jansson/src/pack_unpack.c mergJSON/jansson/src/strbuffer.c mergJSON/jansson/src/strconv.c mergJSON/jansson/src/utf.c mergJSON/jansson/src/value.c -o build/mergJSON-x86.so | ||
| gcc -m32 -O -I mergJSON -I mergJSON/jansson/src -L.-D_LINUX -D_RELEASE -DNDEBUG -DRELEASE -Xlinker -no-undefined -fno-exceptions -Wl,-Bstatic -Wl,-Bdynamic -static -shared mergJSON/mergJSON.c mergJSON/external.c mergJSON/jansson/src/dump.c mergJSON/jansson/src/error.c mergJSON/jansson/src/hashtable.c mergJSON/jansson/src/load.c mergJSON/jansson/src/memory.c mergJSON/jansson/src/pack_unpack.c mergJSON/jansson/src/strbuffer.c mergJSON/jansson/src/strconv.c mergJSON/jansson/src/utf.c mergJSON/jansson/src/value.c -o build/mergJSON-x86.so | ||
|
|
||
| mergJSON-x64.so: mergJSON/mergJSON.c mergJSON/external.h mergJSON/external.c mergJSON/jansson/src/dump.c mergJSON/jansson/src/error.c mergJSON/jansson/src/hashtable.c mergJSON/jansson/src/load.c mergJSON/jansson/src/memory.c mergJSON/jansson/src/pack_unpack.c mergJSON/jansson/src/strbuffer.c mergJSON/jansson/src/strconv.c mergJSON/jansson/src/utf.c mergJSON/jansson/src/value.c | ||
| gcc -m64 -O -I. -I mergJSON/jansson/src -L.-D_LINUX -D_RELEASE -DNDEBUG -DRELEASE -Xlinker -no-undefined -fno-exceptions -Wl,-Bstatic -Wl,-Bdynamic -static -shared mergJSON/mergJSON.c mergJSON/external.c mergJSON/jansson/src/dump.c mergJSON/jansson/src/error.c mergJSON/jansson/src/hashtable.c mergJSON/jansson/src/load.c mergJSON/jansson/src/memory.c mergJSON/jansson/src/pack_unpack.c mergJSON/jansson/src/strbuffer.c mergJSON/jansson/src/strconv.c mergJSON/jansson/src/utf.c mergJSON/jansson/src/value.c -o build/mergJSON-x64.so | ||
| gcc -m64 -O -I mergJSON -I mergJSON/jansson/src -L.-D_LINUX -D_RELEASE -DNDEBUG -DRELEASE -Xlinker -no-undefined -fno-exceptions -Wl,-Bstatic -Wl,-Bdynamic -static -shared mergJSON/mergJSON.c mergJSON/external.c mergJSON/jansson/src/dump.c mergJSON/jansson/src/error.c mergJSON/jansson/src/hashtable.c mergJSON/jansson/src/load.c mergJSON/jansson/src/memory.c mergJSON/jansson/src/pack_unpack.c mergJSON/jansson/src/strbuffer.c mergJSON/jansson/src/strconv.c mergJSON/jansson/src/utf.c mergJSON/jansson/src/value.c -o build/mergJSON-x64.so | ||
|
|
||
| mergJSON.dll: mergJSON/mergJSON.c mergJSON/external.h mergJSON/external.c mergJSON/jansson/src/dump.c mergJSON/jansson/src/error.c mergJSON/jansson/src/hashtable.c mergJSON/jansson/src/load.c mergJSON/jansson/src/memory.c mergJSON/jansson/src/pack_unpack.c mergJSON/jansson/src/strbuffer.c mergJSON/jansson/src/strconv.c mergJSON/jansson/src/utf.c mergJSON/jansson/src/value.c | ||
| gcc -m32 -I. -I mergJSON/jansson/src -D_WIN32 -D_RELEASE -DNDEBUG -DRELEASE -Xlinker -no-undefined -fno-exceptions -Wl,-Bstatic -Wl,-Bdynamic -static -shared mergJSON/mergJSON.c mergJSON/external.c mergJSON/jansson/src/dump.c mergJSON/jansson/src/error.c mergJSON/jansson/src/hashtable.c mergJSON/jansson/src/load.c mergJSON/jansson/src/memory.c mergJSON/jansson/src/pack_unpack.c mergJSON/jansson/src/strbuffer.c mergJSON/jansson/src/strconv.c mergJSON/jansson/src/utf.c mergJSON/jansson/src/value.c -o build/mergJSON.dll | ||
| gcc -m32 -I mergJSON -I mergJSON/jansson/src -D_WIN32 -D_RELEASE -DNDEBUG -DRELEASE -Xlinker -no-undefined -fno-exceptions -Wl,-Bstatic -Wl,-Bdynamic -static -shared mergJSON/mergJSON.c mergJSON/external.c mergJSON/jansson/src/dump.c mergJSON/jansson/src/error.c mergJSON/jansson/src/hashtable.c mergJSON/jansson/src/load.c mergJSON/jansson/src/memory.c mergJSON/jansson/src/pack_unpack.c mergJSON/jansson/src/strbuffer.c mergJSON/jansson/src/strconv.c mergJSON/jansson/src/utf.c mergJSON/jansson/src/value.c -o build/mergJSON.dll |