From 362f3009ac9a8fc7e1cedea66aa72abcdf52d934 Mon Sep 17 00:00:00 2001
From: Peter Powell <petpow@saberuk.com>
Date: Fri, 5 Apr 2013 16:39:40 +0100
Subject: Merge inspircd_{config,version}.h into a single header file.

---
 win/CMakeLists.txt           |  3 +--
 win/config.h.cmake           | 18 ++++++++++++++++++
 win/inspircd_config.h.cmake  | 13 -------------
 win/inspircd_version.h.cmake |  4 ----
 win/win32service.cpp         |  2 +-
 5 files changed, 20 insertions(+), 20 deletions(-)
 create mode 100644 win/config.h.cmake
 delete mode 100644 win/inspircd_config.h.cmake
 delete mode 100644 win/inspircd_version.h.cmake

(limited to 'win')

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/config.h.cmake b/win/config.h.cmake
new file mode 100644
index 000000000..47cdb9f65
--- /dev/null
+++ b/win/config.h.cmake
@@ -0,0 +1,18 @@
+#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@"
+#define LOG_PATH "@LOG_PATH@"
+#define MAXBUF 514
+
+#include "inspircd_win32wrapper.h"
+#include "threadengines/threadengine_win32.h"
+
+#endif
\ No newline at end of file
diff --git a/win/inspircd_config.h.cmake b/win/inspircd_config.h.cmake
deleted file mode 100644
index f98cd391e..000000000
--- a/win/inspircd_config.h.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef INSPIRCD_CONFIG_H
-#define INSPIRCD_CONFIG_H
-
-#define CONFIG_PATH "@CONF_PATH@"
-#define MOD_PATH "@MODULE_PATH@"
-#define DATA_PATH "@DATA_PATH@"
-#define LOG_PATH "@LOG_PATH@"
-#define MAXBUF 514
-
-#include "inspircd_win32wrapper.h"
-#include "threadengines/threadengine_win32.h"
-
-#endif
\ No newline at end of file
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>
-- 
cgit v1.2.3