Simplify the 32-bit mode detection

meson.build

@@ -31,6 +31,9 @@ compiler_options = []
 if get_option('use-winedbg')
   compiler_options += '-DUSE_WINEDBG'
 endif
+if get_option('use-bitbridge')
+  compiler_options += '-DUSE_BITBRIDGE'
+endif
 
 # Generate header files for configuration variables such as the current git tag
 # and the name of the host binary
@@ -92,10 +95,6 @@ executable(
 if get_option('use-bitbridge')
   message('Bitbridge enabled, configuring a 32-bit host application')
 
-  # Only used to add a notice when the host starts to indicate that we're
-  # running in 32-bit compatibility mode
-  compiler_options += '-DUSE_BITBRIDGE'
-
   # I honestly have no idea what the correct way to have `find_dependency()` use
   # `/usr/lib32` instead of `/usr/lib` is. If anyone does know, please tell me!
   winegcc = meson.get_compiler('cpp', native : false)

src/wine-host/vst-host.cpp

@@ -28,10 +28,10 @@ int main(int argc, char* argv[]) {
     // this process.
     if (argc < 3) {
         std::cerr << "Usage: "
-#ifdef USE_BITBRIDGE
+#ifdef _WIN64
-                  << yabridge_wine_host_name_32bit
-#else
                   << yabridge_wine_host_name
+#else
+                  << yabridge_wine_host_name_32bit
 #endif
                   << " <vst_plugin_dll> <unix_domain_socket>" << std::endl;
 
@@ -41,10 +41,8 @@ int main(int argc, char* argv[]) {
     const std::string plugin_dll_path(argv[1]);
     const std::string socket_endpoint_path(argv[2]);
 
-    // TODO: Maybe just check one of macros defined by Wine when compiling for
-    //       32-bit instead
     std::cerr << "Initializing yabridge host version " << yabridge_git_version
-#ifdef USE_BITBRIDGE
+#ifndef _WIN64
               << " (32-bit compatibility mode)"
 #endif
               << std::endl;