Merge pull request #326 from thp/no-static-libraries

Do not build static libraries
thp · Sep 13, 2017 · ab43974 · ab43974
2 parents 72f995f + 3047423
commit ab43974
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 59 deletions.
diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt
@@ -22,12 +22,10 @@ if(SWIG_FOUND)
             unset(CMAKE_SWIG_FLAGS)
             include_directories(${PYTHON_INCLUDE_PATH})
             swig_add_module(psmove python ${CMAKE_CURRENT_LIST_DIR}/psmove.i)
-            swig_link_libraries(psmove psmoveapi_static ${PYTHON_LIBRARIES})
+            swig_link_libraries(psmove psmoveapi ${PYTHON_LIBRARIES})
             if (PSMOVE_BUILD_TRACKER)
-                swig_link_libraries(psmove psmoveapi_tracker_static)
+                swig_link_libraries(psmove psmoveapi_tracker)
             endif()
-            set_target_properties(_psmove PROPERTIES
-                COMPILE_FLAGS -DUSING_STATIC_LIBRARY)
             set(INFO_BUILD_PYTHON_BINDINGS "Yes")
         else()
             set(INFO_BUILD_PYTHON_BINDINGS "No (libpython not found)")
@@ -45,12 +43,10 @@ if(SWIG_FOUND)
             set(CMAKE_SWIG_FLAGS -package ${PSMOVEAPI_JAVA_PKG})
             include_directories(${JNI_INCLUDE_DIRS})
             swig_add_module(psmove_java java ${CMAKE_CURRENT_LIST_DIR}/psmove.i)
-            swig_link_libraries(psmove_java psmoveapi_static ${JNI_LIBRARIES})
+            swig_link_libraries(psmove_java psmoveapi ${JNI_LIBRARIES})
             if (PSMOVE_BUILD_TRACKER)
-                swig_link_libraries(psmove_java psmoveapi_tracker_static)
+                swig_link_libraries(psmove_java psmoveapi_tracker)
             endif()
-            set_target_properties(psmove_java PROPERTIES
-                COMPILE_FLAGS -DUSING_STATIC_LIBRARY)
             set(INFO_BUILD_JAVA_BINDINGS "Yes")
 
             add_custom_target(psmoveapi.jar ALL
@@ -128,12 +124,10 @@ if(SWIG_FOUND)
 
         set(CMAKE_SWIG_FLAGS -namespace ${PSMOVEAPI_CSHARP_NS})
         swig_add_module(psmoveapi_csharp csharp ${CMAKE_CURRENT_LIST_DIR}/psmove.i)
-        swig_link_libraries(psmoveapi_csharp psmoveapi_static)
+        swig_link_libraries(psmoveapi_csharp psmoveapi)
         if (PSMOVE_BUILD_TRACKER)
-            swig_link_libraries(psmoveapi_csharp psmoveapi_tracker_static)
+            swig_link_libraries(psmoveapi_csharp psmoveapi_tracker)
         endif()
-        set_target_properties(psmoveapi_csharp PROPERTIES
-            COMPILE_FLAGS -DUSING_STATIC_LIBRARY)
         set(INFO_BUILD_CSHARP_BINDINGS "Yes")
     else()
         set(INFO_BUILD_CSHARP_BINDINGS "No (disabled)")

diff --git a/include/psmove.h b/include/psmove.h
@@ -39,11 +39,7 @@ extern "C" {
 
 #ifdef _WIN32
 #  define ADDCALL __cdecl
-#  if defined(BUILDING_STATIC_LIBRARY)
-#    define ADDAPI
-#  elif defined(USING_STATIC_LIBRARY)
-#    define ADDAPI
-#  elif defined(BUILDING_SHARED_LIBRARY)
+#  if defined(BUILDING_SHARED_LIBRARY)
 #    define ADDAPI __declspec(dllexport)
 #  else /* using shared library */
 #    define ADDAPI __declspec(dllimport)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -166,13 +166,6 @@ set_target_properties(psmoveapi PROPERTIES
     COMPILE_FLAGS -DBUILDING_SHARED_LIBRARY)
 list(APPEND PSMOVEAPI_INSTALL_TARGETS psmoveapi)
 
-# Static library
-
-add_library(psmoveapi_static STATIC ${PSMOVEAPI_LIBRARY_SRC})
-target_link_libraries(psmoveapi_static ${PSMOVEAPI_REQUIRED_LIBS})
-set_target_properties(psmoveapi_static PROPERTIES
-    COMPILE_FLAGS -DBUILDING_STATIC_LIBRARY)
-
 # For system-wide installation
 
 if(NOT PSMOVEAPI_LIB_DEST)

diff --git a/src/daemon/moved_client.h b/src/daemon/moved_client.h
@@ -31,6 +31,8 @@
 
 
 
+#include "psmove.h"
+
 #include "../psmove_sockets.h"
 
 #include <stdio.h>
@@ -61,21 +63,21 @@ typedef struct _moved_client_list {
     struct _moved_client_list *next;
 } moved_client_list;
 
-moved_client_list *
-moved_client_list_open();
+ADDAPI moved_client_list *
+ADDCALL moved_client_list_open();
 
-void
-moved_client_list_destroy(moved_client_list *client_list);
+ADDAPI void
+ADDCALL moved_client_list_destroy(moved_client_list *client_list);
 
-moved_client *
-moved_client_create(const char *hostname);
+ADDAPI moved_client *
+ADDCALL moved_client_create(const char *hostname);
 
-int
-moved_client_send(moved_client *client, enum PSMoveMovedCmd cmd, int controller_id,
+ADDAPI int
+ADDCALL moved_client_send(moved_client *client, enum PSMoveMovedCmd cmd, int controller_id,
         const uint8_t *data, size_t len);
 
-void
-moved_client_destroy(moved_client *client);
+ADDAPI void
+ADDCALL moved_client_destroy(moved_client *client);
 
 #ifdef __cplusplus
 }

diff --git a/src/psmove_port.h b/src/psmove_port.h
@@ -68,15 +68,15 @@ extern "C" {
 #endif
 
 /* Initialize sockets API (if required) -- call before using sockets */
-void
-psmove_port_initialize_sockets();
+ADDAPI void
+ADDCALL psmove_port_initialize_sockets();
 
 /**
  * Check if necessary permissions are available for pairing controllers
  * Returns non-zero if permissions are available, zero if not
  **/
-int
-psmove_port_check_pairing_permissions();
+ADDAPI int
+ADDCALL psmove_port_check_pairing_permissions();
 
 /**
  * Get the current time in milliseconds since the first call
@@ -93,26 +93,26 @@ ADDCALL psmove_port_sleep_ms(uint32_t duration_ms);
 /**
  * Set the timeout to the specified time in milliseconds for a given socket
  **/
-void
-psmove_port_set_socket_timeout_ms(int socket, uint32_t timeout_ms);
+ADDAPI void
+ADDCALL psmove_port_set_socket_timeout_ms(int socket, uint32_t timeout_ms);
 
 /**
  * Close a socket
  **/
-void
-psmove_port_close_socket(int socket);
+ADDAPI void
+ADDCALL psmove_port_close_socket(int socket);
 
 /**
  * Get the default Bluetooth host controller address (result must be freed)
  **/
-char *
-psmove_port_get_host_bluetooth_address();
+ADDAPI char *
+ADDCALL psmove_port_get_host_bluetooth_address();
 
 /**
  * Add the PS Move Bluetooth controller address to the system database
  **/
-void
-psmove_port_register_psmove(const char *addr, const char *host);
+ADDAPI void
+ADDCALL psmove_port_register_psmove(const char *addr, const char *host);
 
 #ifdef __cplusplus
 }

diff --git a/src/psmove_sockets.h b/src/psmove_sockets.h
@@ -29,6 +29,7 @@
  **/
 
 
+#include "psmove.h"
 
 #ifdef _WIN32
 #  include <winsock2.h>
@@ -41,7 +42,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-const char *inet_ntop(int af, const void *src, char *dst, int cnt);
+ADDAPI const char *
+ADDCALL inet_ntop(int af, const void *src, char *dst, int cnt);
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/tracker/CMakeLists.txt b/src/tracker/CMakeLists.txt
@@ -153,16 +153,6 @@ if(PSMOVE_BUILD_TRACKER)
     set_target_properties(psmoveapi_tracker PROPERTIES
         COMPILE_FLAGS -DBUILDING_SHARED_LIBRARY)
     list(APPEND PSMOVEAPI_INSTALL_TARGETS psmoveapi_tracker)
-
-    add_library(psmoveapi_tracker_static STATIC
-        ${PSMOVEAPI_TRACKER_SRC}
-        ${PSMOVEAPI_TRACKER_PLATFORM_SRC})
-    target_link_libraries(psmoveapi_tracker_static
-        psmoveapi_static
-        ${PSMOVEAPI_REQUIRED_LIBS}
-        ${PSMOVEAPI_TRACKER_REQUIRED_LIBS})
-    set_target_properties(psmoveapi_tracker_static PROPERTIES
-        COMPILE_FLAGS -DBUILDING_STATIC_LIBRARY)
 endif()
 
 message("")

diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt
@@ -6,7 +6,6 @@ include_directories(${ROOT_DIR}/src)
 
 # New command line interface
 add_executable(psmove ${CMAKE_CURRENT_LIST_DIR}/psmovecli.cpp)
-target_link_libraries(psmove psmoveapi_static)
-set_target_properties(psmove PROPERTIES COMPILE_FLAGS -DUSING_STATIC_LIBRARY)
+target_link_libraries(psmove psmoveapi)
 set_property(TARGET psmove PROPERTY FOLDER "Utilities")
 list(APPEND PSMOVEAPI_INSTALL_TARGETS psmove)