diff options
| author | Peter Powell <petpow@saberuk.com> | 2013-04-05 16:39:40 +0100 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2013-04-05 16:39:40 +0100 |
| commit | 362f3009ac9a8fc7e1cedea66aa72abcdf52d934 (patch) | |
| tree | 266065ea765be60f52a55208790c52872353a425 /win | |
| parent | bb3aa2fb37071f48a5312df8688c0a6990644fbb (diff) | |
Merge inspircd_{config,version}.h into a single header file.
Diffstat (limited to 'win')
| -rw-r--r-- | win/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | win/config.h.cmake (renamed from win/inspircd_config.h.cmake) | 5 | ||||
| -rw-r--r-- | win/inspircd_version.h.cmake | 4 | ||||
| -rw-r--r-- | win/win32service.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/win/CMakeLists.txt b/win/CMakeLists.txt index f26b9a6c7..827ef1c90 100644 --- a/win/CMakeLists.txt +++ b/win/CMakeLists.txt @@ -56,8 +56,7 @@ if(MSVC) endif(MSVC) configure_file("${INSPIRCD_BASE}/win/inspircd.rc.cmake" "${INSPIRCD_BASE}/win/inspircd.rc") -configure_file("${INSPIRCD_BASE}/win/inspircd_version.h.cmake" "${INSPIRCD_BASE}/win/inspircd_version.h") -configure_file("${INSPIRCD_BASE}/win/inspircd_config.h.cmake" "${INSPIRCD_BASE}/win/inspircd_config.h") +configure_file("${INSPIRCD_BASE}/win/config.h.cmake" "${INSPIRCD_BASE}/win/config.h") add_executable(inspircd ${INSPIRCD_SOURCES} "${INSPIRCD_BASE}/win/inspircd.rc") target_link_libraries(inspircd win32_memory) diff --git a/win/inspircd_config.h.cmake b/win/config.h.cmake index f98cd391e..47cdb9f65 100644 --- a/win/inspircd_config.h.cmake +++ b/win/config.h.cmake @@ -1,6 +1,11 @@ #ifndef INSPIRCD_CONFIG_H
#define INSPIRCD_CONFIG_H
+#define BRANCH "@MAJOR_VERSION@.@MINOR_VERSION@"
+#define VERSION "@FULL_VERSION@"
+#define REVISION "0"
+#define SYSTEM "@CMAKE_SYSTEM@"
+
#define CONFIG_PATH "@CONF_PATH@"
#define MOD_PATH "@MODULE_PATH@"
#define DATA_PATH "@DATA_PATH@"
diff --git a/win/inspircd_version.h.cmake b/win/inspircd_version.h.cmake deleted file mode 100644 index 1aec12b24..000000000 --- a/win/inspircd_version.h.cmake +++ /dev/null @@ -1,4 +0,0 @@ -#define BRANCH "@MAJOR_VERSION@.@MINOR_VERSION@"
-#define VERSION "@FULL_VERSION@"
-#define REVISION "0"
-#define SYSTEM "@CMAKE_SYSTEM@"
\ No newline at end of file diff --git a/win/win32service.cpp b/win/win32service.cpp index c34e9957d..d06ad1838 100644 --- a/win/win32service.cpp +++ b/win/win32service.cpp @@ -17,7 +17,7 @@ */ -#include "inspircd_config.h" +#include "config.h" #include "inspircd.h" #include "exitcodes.h" #include <windows.h> |