File tree Expand file tree Collapse file tree 2 files changed +3
-11
lines changed Expand file tree Collapse file tree 2 files changed +3
-11
lines changed Original file line number Diff line number Diff line change @@ -7,9 +7,6 @@ include_guard(GLOBAL)
77function (add_windows_resources target rc_file)
88 if (WIN32 )
99 target_sources (${target} PRIVATE ${rc_file} )
10- set_property (SOURCE ${rc_file}
11- APPEND PROPERTY COMPILE_DEFINITIONS WINDRES_PREPROC
12- )
1310 endif ()
1411endfunction ()
1512
Original file line number Diff line number Diff line change 1717// ! Copyright string used in Windows .rc files
1818#define COPYRIGHT_STR " 2009-" STRINGIZE(COPYRIGHT_YEAR) " " COPYRIGHT_HOLDERS_FINAL
1919
20- /* *
21- * bitcoind-res.rc includes this file, but it cannot cope with real c++ code.
22- * WINDRES_PREPROC is defined to indicate that its pre-processor is running.
23- * Anything other than a define should be guarded below.
24- */
25-
26- #if !defined(WINDRES_PREPROC)
20+ // Windows .rc files include this header, but they cannot cope with real C++ code.
21+ #if !defined(RC_INVOKED)
2722
2823#include < string>
2924#include < vector>
@@ -44,6 +39,6 @@ std::string CopyrightHolders(const std::string& strPrefix);
4439/* * Returns licensing information (for -version) */
4540std::string LicenseInfo ();
4641
47- #endif // WINDRES_PREPROC
42+ #endif // RC_INVOKED
4843
4944#endif // BITCOIN_CLIENTVERSION_H
You can’t perform that action at this time.
0 commit comments