From 16464aa66250de208707dbd9c52976f9588dff6e Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Sat, 14 Nov 2015 03:06:26 +0300 Subject: [PATCH] Library constructor and cmake/backbone submodule updated. --- cmake/backbone | 2 +- src/latex-struct/CMakeLists.txt | 4 +++- src/library_constructor.c | 35 --------------------------------- 3 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 src/library_constructor.c diff --git a/cmake/backbone b/cmake/backbone index a0b6683..02f3a0f 160000 --- a/cmake/backbone +++ b/cmake/backbone @@ -1 +1 @@ -Subproject commit a0b668336067535dbb84e7e7d01b9730af429541 +Subproject commit 02f3a0f7d969534872799b45a95d3c5a6fef14c3 diff --git a/src/latex-struct/CMakeLists.txt b/src/latex-struct/CMakeLists.txt index c376666..dc949fb 100644 --- a/src/latex-struct/CMakeLists.txt +++ b/src/latex-struct/CMakeLists.txt @@ -2,6 +2,8 @@ SET (LibName ${PROJECT_LOWERCASE_NAME}) FILE (GLOB_RECURSE LibSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.vala) SET (LibPackages gee-0.8 posix) SET (LibPkgModules gee-0.8) -SET (LibExtraSources ${PROJECT_SOURCE_DIR}/src/library_constructor.c) SET (LibInstall ON) +SET (LibExtraSources ${CMAKE_CURRENT_BINARY_DIR}/library_constructor.c) +SET (LC_RELATIVE_PREFIX "..") +CONFIGURE_FILE ( "${CMAKE_SOURCE_DIR}/cmake/backbone/templates/library_constructor.c.in" "${LibExtraSources}") INCLUDE (ValaLibCommonRules) diff --git a/src/library_constructor.c b/src/library_constructor.c deleted file mode 100644 index ca244e0..0000000 --- a/src/library_constructor.c +++ /dev/null @@ -1,35 +0,0 @@ -#if defined(_WIN32) || defined(_WIN64) -#include -#endif - -#include "gettext-config.h" - -#if defined(_WIN32) || defined(_WIN64) -BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved) -#elif defined(linux) || defined(UNIX) || defined(__unix__) -void __attribute__ ((constructor)) load_library (void) -#endif -{ -#if defined(_WIN32) || defined(_WIN64) - gchar dllPath[FILENAME_MAX], - *dllDir, - *localePath; - - GetModuleFileName (hInstance, dllPath, FILENAME_MAX); - dllDir = g_path_get_dirname (dllPath); - localePath = g_build_filename (dllDir, "../share/locale", NULL); - g_free (dllDir); - bindtextdomain (GETTEXT_PACKAGE, localePath); - g_free (localePath); -#endif - -#if (!GLIB_CHECK_VERSION (2, 36, 0)) - g_type_init (); -#endif - -#if defined(_WIN32) || defined(_WIN64) - (void) dwReason; // avoid - (void) lpReserved; // warnings - return TRUE; -#endif -}