Skip defines in includes

Author: kunitoki

thirdparty/flac_library/flac_include_pre.h

@@ -67,15 +67,6 @@
  #include <windows.h>
 #endif
 
-#if __APPLE__
- #include <TargetConditionals.h>
- #if TARGET_OS_IPHONE && TARGET_IPHONE_SIMULATOR
- #elif TARGET_OS_IPHONE
- #else
-  #define TARGET_OS_OSX 1
- #endif
-#endif
-
 #ifdef DEBUG
  #include <assert.h>
 #endif
@@ -90,10 +81,6 @@
  #define HAVE_LROUND 1
 #endif
 
-#if TARGET_OS_OSX
- #define FLAC__SYS_DARWIN 1
-#endif
-
 #ifndef SIZE_MAX
  #define SIZE_MAX 0xffffffff
 #endif
@@ -153,9 +140,6 @@
  #endif
 #endif
 
-//#define flac_max(a, b) ((a) > (b) ? (a) : (b))
-//#define flac_min(a, b) ((a) < (b) ? (a) : (b))
-
 #pragma push_macro ("DEBUG")
 #pragma push_macro ("NDEBUG")
 #undef  DEBUG  // (some flac code dumps debug trace if the app defines this macro)

thirdparty/flac_library/flac_library.h

@@ -33,6 +33,8 @@
     upstream:         https://ftp.osuosl.org/pub/xiph/releases/flac/flac-1.5.0.tar.xz
     license:          BSD
 
+    defines:          FLAC__NO_DLL=1 FLAC__HAS_OGG=0
+    macDefines:       FLAC__SYS_DARWIN=1
     searchpaths:      include src src/libFLAC src/libFLAC/include
 
   END_YUP_MODULE_DECLARATION
@@ -42,7 +44,4 @@
 
 #pragma once
 
-#define FLAC__NO_DLL 1
-#define FLAC__HAS_OGG 0
-
 #include <FLAC/all.h>