force correct fPic for both static and shared

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a7a5b37347588ce47c93c0ad652e7f7587360f8e..1dc47c2c1b390230bcf2c1323b42dbbe05c1315a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,9 +22,6 @@ INCLUDE(GNUInstallDirs)
 
 FILE(GLOB sources src/*.c)
 
-ADD_LIBRARY("${PROJECT_NAME}_shared" SHARED ${sources})
-ADD_LIBRARY("${PROJECT_NAME}_static" STATIC ${sources})
-
 CONFIGURE_FILE(vkh.pc.in vkh.pc @ONLY)
 INSTALL(FILES ${CMAKE_BINARY_DIR}/vkh.pc DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig)
 
@@ -49,7 +46,12 @@ FUNCTION (setup_lib LibName)
                PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 ENDFUNCTION ()
 
+ADD_LIBRARY("${PROJECT_NAME}_static" STATIC ${sources})
+SET_PROPERTY(TARGET "${PROJECT_NAME}_static" PROPERTY POSITION_INDEPENDENT_CODE OFF)
 setup_lib ("${PROJECT_NAME}_static")
+
+ADD_LIBRARY("${PROJECT_NAME}_shared" SHARED ${sources})
+SET_PROPERTY(TARGET "${PROJECT_NAME}_static" PROPERTY POSITION_INDEPENDENT_CODE ON)
 setup_lib ("${PROJECT_NAME}_shared")
 
 

diff --git a/src/vkh_device.h b/src/vkh_device.h
index d254568e53a6f292786cdb0165fd3631a256c8ce..6ddeaedcc071c01f4651ce2eb2a0f6b56ccbe32c 100644 (file)
--- a/src/vkh_device.h
+++ b/src/vkh_device.h
@@ -4,10 +4,13 @@
 #include "vkh.h"
 
 typedef struct _vkh_device_t{
-    VkPhysicalDevice    phy;
-    VkDevice            dev;
-
+    VkDevice                           dev;
     VkPhysicalDeviceMemoryProperties phyMemProps;
+    VkRenderPass                       renderPass;
+//    VkPhysicalDevice    phy;
+//    VkDevice            dev;
+
+//    VkPhysicalDeviceMemoryProperties phyMemProps;
 }vkh_device_t;
 
 #endif