Sfoglia il codice sorgente

Fix custom version file include

Scott Lahteine 4 anni fa
parent
commit
2460a3dfbb
2 ha cambiato i file con 6 aggiunte e 6 eliminazioni
  1. 4
    0
      Marlin/src/core/macros.h
  2. 2
    6
      Marlin/src/inc/MarlinConfigPre.h

+ 4
- 0
Marlin/src/core/macros.h Vedi File

@@ -21,6 +21,10 @@
21 21
  */
22 22
 #pragma once
23 23
 
24
+#if !defined(__has_include)
25
+  #define __has_include(...) 1
26
+#endif
27
+
24 28
 #define ABCE 4
25 29
 #define XYZE 4
26 30
 #define ABC  3

+ 2
- 6
Marlin/src/inc/MarlinConfigPre.h Vedi File

@@ -37,12 +37,8 @@
37 37
 #include "../../Configuration.h"
38 38
 
39 39
 #ifdef CUSTOM_VERSION_FILE
40
-  #if defined(__has_include)
41
-    #if __has_include(XSTR(../../CUSTOM_VERSION_FILE))
42
-      #include XSTR(../../CUSTOM_VERSION_FILE)
43
-    #endif
44
-  #else
45
-    #include XSTR(../../CUSTOM_VERSION_FILE)
40
+  #if __has_include(STRINGIFY(../../CUSTOM_VERSION_FILE))
41
+    #include STRINGIFY(../../CUSTOM_VERSION_FILE)
46 42
   #endif
47 43
 #endif
48 44
 

Loading…
Annulla
Salva