mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-31 01:30:02 +02:00
Code Issues Releases Wiki Activity

* Moved OS X definitions to CMakeLists.txt, so we can easily re-merge upstream of miniupnp.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-09-10 03:43:35 +02:00
parent e72cf5423c
commit 76d4821295
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
thirdparty/libportfwd/CMakeLists.txt vendored
View File

@@ -16,9 +16,11 @@ INCLUDE_DIRECTORIES( ${MINIUPNP_DIR} include ${QT_INCLUDES} )
SET( CMAKE_C_FLAGS ${CLEAN_C_FLAGS} ) SET( CMAKE_C_FLAGS ${CLEAN_C_FLAGS} )
ADD_DEFINITIONS( -DPORTFWDDLLEXPORT_PRO ) ADD_DEFINITIONS( -DPORTFWDDLLEXPORT_PRO )
if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
ADD_DEFINITIONS( -DMACOSX -D_DARWIN_C_SOURCE )
endif ()
ADD_LIBRARY(tomahawk_portfwd SHARED ADD_LIBRARY(tomahawk_portfwd SHARED
# the needed bits of miniupnpc (no python module, no tests, no cli) # the needed bits of miniupnpc (no python module, no tests, no cli)
${MINIUPNP_DIR}/connecthostport.c ${MINIUPNP_DIR}/connecthostport.c
${MINIUPNP_DIR}/igd_desc_parse.c ${MINIUPNP_DIR}/igd_desc_parse.c
@@ -57,6 +59,6 @@ INSTALL( TARGETS tomahawk_portfwd
# ) # )
#TARGET_LINK_LIBRARIES(portfwd-demo portfwd) #TARGET_LINK_LIBRARIES(portfwd-demo portfwd)
# INSTALL(TARGETS portfwd ARCHIVE DESTINATION lib${LIB_SUFFIX}) #INSTALL(TARGETS portfwd ARCHIVE DESTINATION lib${LIB_SUFFIX})
#INSTALL(TARGETS portfwd-demo RUNTIME DESTINATION bin) #INSTALL(TARGETS portfwd-demo RUNTIME DESTINATION bin)
#INSTALL(DIRECTORY include/portfwd DESTINATION include PATTERN "*~" EXCLUDE) #INSTALL(DIRECTORY include/portfwd DESTINATION include PATTERN "*~" EXCLUDE)

4
thirdparty/libportfwd/third-party/miniupnpc-1.6/miniupnpc.c vendored
View File

@@ -16,10 +16,6 @@
#endif #endif
#endif #endif
#ifdef __APPLE__
#define _DARWIN_C_SOURCE
#endif
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>