Browse Source

Fix custom version file include

Scott Lahteine 5 years ago
parent
commit
2460a3dfbb
2 changed files with 6 additions and 6 deletions
  1. 4
    0
      Marlin/src/core/macros.h
  2. 2
    6
      Marlin/src/inc/MarlinConfigPre.h

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

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

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

37
 #include "../../Configuration.h"
37
 #include "../../Configuration.h"
38
 
38
 
39
 #ifdef CUSTOM_VERSION_FILE
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
   #endif
42
   #endif
47
 #endif
43
 #endif
48
 
44
 

Loading…
Cancel
Save