1
0
mirror of https://github.com/Tha14/toxic.git synced 2025-06-19 08:26:35 +02:00

Merge with master

This commit is contained in:
Jfreegman
2015-11-02 15:22:52 -05:00
24 changed files with 549 additions and 513 deletions

View File

@ -6,7 +6,7 @@ PKG_CONFIG_PATH = $(shell export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/local/o
LIBS := $(filter-out ncursesw, $(LIBS))
# OS X ships a usable, recent version of ncurses, but calls it ncurses not ncursesw.
LDFLAGS += -lncurses -lalut -ltoxav -ltoxcore -ltoxdns -lresolv -lconfig -ltoxencryptsave -g
LDFLAGS += -lncurses -lalut -ltoxav -ltoxcore -lcurl -lconfig -ltoxencryptsave -g
CFLAGS += -I/usr/local/opt/freealut/include/AL -I/usr/local/opt/glib/include/glib-2.0 -g
OSX_LIBRARIES = -lobjc -lresolv
@ -15,4 +15,4 @@ OSX_FRAMEWORKS = -framework Foundation -framework CoreFoundation -framework AVFo
OSX_VIDEO = osx_video.m
LDFLAGS += $(OSX_LIBRARIES) $(OSX_FRAMEWORKS)
OBJ += osx_video.o
OBJ += osx_video.o

View File

@ -1,4 +1,4 @@
# Specials options for linux systems
CFLAGS +=
LDFLAGS += -ldl -lresolv -lrt
LDFLAGS += -ldl -lrt -lcurl
MANDIR = $(PREFIX)/share/man