From: Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
Date: Fri, 6 Apr 2018 02:44:01 +0000 (+0200)
Subject: force correct fPic for both static and shared
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=e5333027ccbb7bb1c1e11e1164329530eac1da96;p=jp%2Fvkhelpers.git

force correct fPic for both static and shared
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a7a5b37..1dc47c2 100644
--- 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 d254568..6ddeaed 100644
--- 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