Skip to content
Snippets Groups Projects
Commit 8bb6303d authored by deuce's avatar deuce
Browse files

-lpthread is actually an XPDEV-MT_LIBS thing, not a common MT_LDFLAGS thing

(Needed for static linking)
parent c4f1042e
Branches
Tags
No related merge requests found
...@@ -242,7 +242,7 @@ else ...@@ -242,7 +242,7 @@ else
else else
ifeq ($(os),netbsd) # NetBSD ifeq ($(os),netbsd) # NetBSD
MT_CFLAGS += -DUSE_XP_SEMAPHORES MT_CFLAGS += -DUSE_XP_SEMAPHORES
MT_LDFLAGS += -L/usr/pkg/lib -lpthread MT_LDFLAGS += -L/usr/pkg/lib
XP_SEM := 1 XP_SEM := 1
else else
ifeq ($(os),qnx) # QNX ifeq ($(os),qnx) # QNX
...@@ -250,18 +250,15 @@ else ...@@ -250,18 +250,15 @@ else
ifeq ($(os),darwin) # Darwin/Mac OS X ifeq ($(os),darwin) # Darwin/Mac OS X
CFLAGS += -D__unix__ CFLAGS += -D__unix__
MT_CFLAGS += -DUSE_XP_SEMAPHORES -D__DARWIN__ MT_CFLAGS += -DUSE_XP_SEMAPHORES -D__DARWIN__
MT_LDFLAGS += -lpthread
XP_SEM := 1 XP_SEM := 1
else else
ifeq ($(os),sunos) # Solaris ifeq ($(os),sunos) # Solaris
XP_SEM := 1 XP_SEM := 1
MT_CFLAGS += -D_POSIX_PTHREAD_SEMANTICS MT_CFLAGS += -D_POSIX_PTHREAD_SEMANTICS
MT_CFLAGS += -DUSE_XP_SEMAPHORES MT_CFLAGS += -DUSE_XP_SEMAPHORES
MT_LDFLAGS += -lpthread
else # Linux / Other UNIX else # Linux / Other UNIX
XP_SEM := 1 XP_SEM := 1
MT_CFLAGS += -DUSE_XP_SEMAPHORES MT_CFLAGS += -DUSE_XP_SEMAPHORES
MT_LDFLAGS += -lpthread
endif endif
endif endif
endif endif
......
...@@ -2,9 +2,21 @@ XPDEV_LIBS += -lm ...@@ -2,9 +2,21 @@ XPDEV_LIBS += -lm
XPDEV-MT_LIBS += -lm XPDEV-MT_LIBS += -lm
ifeq ($(os),netbsd) # NetBSD ifeq ($(os),netbsd) # NetBSD
XPDEV_LIBS += -lossaudio XPDEV_LIBS += -lossaudio
XPDEV-MT_LIBS += -lossaudio XPDEV-MT_LIBS += -lossaudio -lpthread
endif endif
ifeq ($(os),openbsd) # OpenBSD ifeq ($(os),openbsd) # OpenBSD
XPDEV_LIBS += -lossaudio XPDEV_LIBS += -lossaudio
XPDEV-MT_LIBS += -lossaudio XPDEV-MT_LIBS += -lossaudio -lpthread
endif
ifeq ($(os),sunos) # Solaris
XPDEV-MT_LIBS += -lpthread
endif
ifeq ($(os),darwin) # Mac OS/X
XPDEV-MT_LIBS += -lpthread
endif
ifeq ($(os),qnx) # QNX
XPDEV-MT_LIBS += -lpthread
endif
ifeq ($(os),linux) # Linux
XPDEV-MT_LIBS += -lpthread
endif endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment