From 4b4ba14583bcf7921bccb84925290ecf7de2a46f Mon Sep 17 00:00:00 2001 From: davilla Date: Wed, 5 Sep 2012 18:25:25 -0400 Subject: [osx] fixed command-line make, duplicate symbol NPT_GetSystemMachineName, choose cocoa flavor over posix --- lib/libUPnP/Makefile.in | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/libUPnP/Makefile.in b/lib/libUPnP/Makefile.in index b98e215d82..2fcd3d4e9a 100644 --- a/lib/libUPnP/Makefile.in +++ b/lib/libUPnP/Makefile.in @@ -60,7 +60,6 @@ SRCS= Platinum/Source/Core/PltAction.cpp \ Neptune/Source/System/Bsd/NptBsdNetwork.cpp \ Neptune/Source/System/Posix/NptPosixSystem.cpp \ Neptune/Source/System/Posix/NptSelectableMessageQueue.cpp \ - Neptune/Source/System/Posix/NptPosixEnvironment.cpp \ Neptune/Source/System/Posix/NptPosixQueue.cpp \ Neptune/Source/System/Posix/NptPosixThreads.cpp \ Neptune/Source/System/Posix/NptPosixTime.cpp \ @@ -78,8 +77,12 @@ ifeq ($(findstring osx,$(ARCH)),osx) .SUFFIXES : .m .mm -SRCS+= Neptune/Source/System/Apple/NptAppleAutoreleasePool.mm \ - Neptune/Source/System/Cocoa/NptCocoaEnviroment.mm \ +SRCS+= Neptune/Source/System/Apple/NptAppleAutoreleasePool.mm +SRCS+= Neptune/Source/System/Cocoa/NptCocoaEnviroment.mm + +else + +SRCS+= Neptune/Source/System/Posix/NptPosixEnvironment.cpp endif -- cgit v1.2.3