From 7a5fe4c5a14ce9636d5a0fe06ccb8001d87f1a18 Mon Sep 17 00:00:00 2001 From: John Emmas Date: Mon, 2 Dec 2024 10:55:02 +0000 Subject: [PATCH] ytk: some #defines need to be different when building with MSVC --- libs/tk/ydk/config.h | 4 ++++ libs/tk/ytk/config.h | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h index d933837df2..229b61be71 100644 --- a/libs/tk/ydk/config.h +++ b/libs/tk/ydk/config.h @@ -17,8 +17,10 @@ #define HAVE_BROKEN_WCTYPE 1 #endif +#ifndef _MSC_VER /* Define to 1 if you have the header file. */ #define HAVE_FTW_H 1 +#endif /* Define to 1 if you have the `getresuid' function. */ #if !(defined PLATFORM_WINDOWS || defined __APPLE__) @@ -61,8 +63,10 @@ /* Define to 1 if you have the header file. */ #define HAVE_STRING_H 1 +#ifndef _MSC_VER /* Define to 1 if you have the header file. */ #define HAVE_SYS_PARAM_H 1 +#endif /* Define to 1 if sys/sysinfo.h is available */ #if !(defined PLATFORM_WINDOWS || defined __APPLE__) diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h index f9991eee10..5a04482361 100644 --- a/libs/tk/ytk/config.h +++ b/libs/tk/ytk/config.h @@ -1,6 +1,10 @@ /* always defined to indicate that i18n is enabled */ /* #undef ENABLE_NLS */ +#ifdef _MSC_VER +#define GETTEXT_PACKAGE "gtk20" +#endif + /* Define the location where the catalogs will be installed */ #define GTK_LOCALEDIR "/ardour/share/locale" @@ -14,8 +18,10 @@ #define HAVE_BROKEN_WCTYPE 1 #endif +#ifndef _MSC_VER /* Define to 1 if you have the header file. */ #define HAVE_FTW_H 1 +#endif /* Define to 1 if you have the `getresuid' function. */ #if !(defined PLATFORM_WINDOWS || defined __APPLE__) @@ -58,8 +64,10 @@ /* Define to 1 if you have the header file. */ #define HAVE_STRING_H 1 +#ifndef _MSC_VER /* Define to 1 if you have the header file. */ #define HAVE_SYS_PARAM_H 1 +#endif /* Define to 1 if sys/sysinfo.h is available */ #if !(defined PLATFORM_WINDOWS || defined __APPLE__)