windows: fix static builds, by some define magic

Author: Totto16

src/helper/windows.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #if defined(_MSC_VER)
+#if defined(OOPETRIS_LIBRARY_GRAPHICS_COMPILATION)
 #if defined(OOPETRIS_LIBRARY_GRAPHICS_EXPORT)
 #define OOPETRIS_GRAPHICS_EXPORTED __declspec(dllexport)
 #else
@@ -9,3 +10,6 @@
 #else
 #define OOPETRIS_GRAPHICS_EXPORTED
 #endif
+#else
+#define OOPETRIS_GRAPHICS_EXPORTED
+#endif

src/libs/core/hash-library/sha256.h

@@ -18,11 +18,15 @@ typedef unsigned __int8 uint8_t;
 typedef unsigned __int32 uint32_t;
 typedef unsigned __int64 uint64_t;
 
+#if defined(HASH_LIBRARY_COMPILATION)
 #if defined(HASH_LIBRARY_EXPORT)
 #define HASH_LIBRARY_EXPORTED __declspec(dllexport)
 #else
 #define HASH_LIBRARY_EXPORTED __declspec(dllimport)
 #endif
+#else
+#define HASH_LIBRARY_EXPORTED
+#endif
 
 #else
 // GCC

src/libs/core/helper/windows.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #if defined(_MSC_VER)
+#if defined(OOPETRIS_LIBRARY_CORE_COMPILATION)
 #if defined(OOPETRIS_LIBRARY_CORE_EXPORT)
 #define OOPETRIS_CORE_EXPORTED __declspec(dllexport)
 #else
@@ -9,3 +10,6 @@
 #else
 #define OOPETRIS_CORE_EXPORTED
 #endif
+#else
+#define OOPETRIS_CORE_EXPORTED
+#endif

src/libs/core/meson.build

@@ -13,7 +13,7 @@ liboopetris_core = library(
     core_header_files,
     include_directories: core_lib.get('inc_dirs'),
     dependencies: core_lib.get('deps'),
-    cpp_args: core_lib.get('compile_args'),
+    cpp_args: [core_lib.get('compile_args'),'-DOOPETRIS_LIBRARY_CORE_COMPILATION','-DHASH_LIBRARY_COMPILATION'],
     cpp_shared_args: ['-DOOPETRIS_LIBRARY_CORE_EXPORT', '-DHASH_LIBRARY_EXPORT'],
     override_options: {
         'warning_level': '3',

src/libs/recordings/meson.build

@@ -16,7 +16,7 @@ liboopetris_recordings = library(
     recordings_header_files,
     include_directories: recordings_lib.get('inc_dirs'),
     dependencies: recordings_lib.get('deps'),
-    cpp_args: recordings_lib.get('compile_args'),
+    cpp_args: [recordings_lib.get('compile_args'),'-DOOPETRIS_LIBRARY_RECORDINGS_COMPILATION'],
     cpp_shared_args: ['-DOOPETRIS_LIBRARY_RECORDINGS_EXPORT'],
     override_options: {
         'warning_level': '3',

src/libs/recordings/utility/windows.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #if defined(_MSC_VER)
+#if defined(OOPETRIS_LIBRARY_RECORDINGS_COMPILATION)
 #if defined(OOPETRIS_LIBRARY_RECORDINGS_EXPORT)
 #define OOPETRIS_RECORDINGS_EXPORTED __declspec(dllexport)
 #else
@@ -9,3 +10,6 @@
 #else
 #define OOPETRIS_RECORDINGS_EXPORTED
 #endif
+#else
+#define OOPETRIS_RECORDINGS_EXPORTED
+#endif

src/meson.build

@@ -30,7 +30,7 @@ if build_application
         graphics_src_files,
         include_directories: graphics_lib.get('inc_dirs'),
         dependencies: graphics_lib.get('deps'),
-        cpp_args: graphics_lib.get('compile_args'),
+        cpp_args: [graphics_lib.get('compile_args'),'-DOOPETRIS_LIBRARY_GRAPHICS_COMPILATION'],
         cpp_shared_args: ['-DOOPETRIS_LIBRARY_GRAPHICS_EXPORT'],
         override_options: {
             'warning_level': '3',