Merge branch 'master' of github.com:stv0g/libsml
(I've fixed the linking issue of libuuid on linux systems at the same time as you) Conflicts: .gitignore examples/Makefile test/Makefile
This commit is contained in:
commit
2097ee52f1
2 changed files with 2 additions and 0 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -14,3 +14,4 @@
|
|||
*.lai
|
||||
*.la
|
||||
*.a
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
UNAME := $(shell uname)
|
||||
CFLAGS += -I../sml/include/ -Wall
|
||||
LIBSML = ../sml/lib/libsml.a
|
||||
LIBS = -luuid
|
||||
|
||||
ifeq ($(UNAME), Linux)
|
||||
LIBS = -luuid
|
||||
|
|
Loading…
Add table
Reference in a new issue