luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-20 15:48:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Windows: fix wrong typelib path

Browse Source
This commit is contained in:
Dan Yeaw
2025-04-12 15:45:51 +00:00
committed by Philip Withnall
parent 2d66caf6cb
commit 5f12b1b400
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
girepository/girepository.c
View File

@@ -140,8 +140,6 @@ G_DEFINE_TYPE (GIRepository, gi_repository, G_TYPE_OBJECT);
static HMODULE girepository_dll = NULL; static HMODULE girepository_dll = NULL;
#ifdef DLL_EXPORT
BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved); BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);
BOOL WINAPI BOOL WINAPI
@@ -155,7 +153,6 @@ DllMain (HINSTANCE hinstDLL,
return TRUE; return TRUE;
} }
#endif /* DLL_EXPORT */
#endif /* G_PLATFORM_WIN32 */ #endif /* G_PLATFORM_WIN32 */
#ifdef __APPLE__ #ifdef __APPLE__

2
girepository/tests/repository-search-paths.c
View File

@@ -27,7 +27,7 @@ test_repository_search_paths_get_expected_libdir_path (void)
{ {
#if defined(G_PLATFORM_WIN32) #if defined(G_PLATFORM_WIN32)
const char *tests_build_dir = g_getenv ("G_TEST_BUILDDIR"); const char *tests_build_dir = g_getenv ("G_TEST_BUILDDIR");
char *expected_rel_path = g_build_filename (tests_build_dir, "lib", "girepository-1.0", NULL); char *expected_rel_path = g_build_filename (tests_build_dir, "..", "lib", "girepository-1.0", NULL);
#elif defined(__APPLE__) #elif defined(__APPLE__)
const char *tests_build_dir = g_getenv ("G_TEST_BUILDDIR"); const char *tests_build_dir = g_getenv ("G_TEST_BUILDDIR");
char *expected_rel_path = g_build_filename (tests_build_dir, "..", "girepository-1.0", NULL); char *expected_rel_path = g_build_filename (tests_build_dir, "..", "girepository-1.0", NULL);