zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix custom version file include

Browse source
This commit is contained in:
Scott Lahteine 2020-03-21 23:31:02 -05:00
parent 2c325c2a7d
commit 2460a3dfbb
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/core/macros.h
View file

@ -21,6 +21,10 @@
*/ */
#pragma once #pragma once
#if !defined(__has_include)
#define __has_include(...) 1
#endif
#define ABCE 4 #define ABCE 4
#define XYZE 4 #define XYZE 4
#define ABC 3 #define ABC 3

8
Marlin/src/inc/MarlinConfigPre.h
View file

@ -37,12 +37,8 @@
#include "../../Configuration.h" #include "../../Configuration.h"
#ifdef CUSTOM_VERSION_FILE #ifdef CUSTOM_VERSION_FILE
#if defined(__has_include) #if __has_include(STRINGIFY(../../CUSTOM_VERSION_FILE))
#if __has_include(XSTR(../../CUSTOM_VERSION_FILE)) #include STRINGIFY(../../CUSTOM_VERSION_FILE)
#include XSTR(../../CUSTOM_VERSION_FILE)
#endif
#else
#include XSTR(../../CUSTOM_VERSION_FILE)
#endif #endif
#endif #endif