Move pugixml.rc to scripts/

This keeps src/ folder clean of auxiliary files only required for special builds; note that CMakeLists.txt already depends on scripts/ (specifically for pkgconfig setup).
pktplumber · Sep 21, 2019 · 6934b12 · 6934b12
1 parent 6fb765c
commit 6934b12
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,8 +31,9 @@ mark_as_advanced(CLEAR CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_INCLUDEDIR)
 
 set(HEADERS src/pugixml.hpp src/pugiconfig.hpp)
 set(SOURCES src/pugixml.cpp)
+
 if(BUILD_SHARED_LIBS AND MSVC)
-	set(PUGIXML_WINDLL_SRCS	src/win32/pugixml.rc)
+	set(PUGIXML_WINDLL_SRCS	scripts/pugixml_dll.rc)
 endif()
 
 if(DEFINED BUILD_DEFINES)

diff --git a/src/win32/pugixml.rc → scripts/pugixml_dll.rc b/src/win32/pugixml.rc → scripts/pugixml_dll.rc
@@ -1,11 +1,9 @@
 #include <winver.h>
-//#include "../pugixml.hpp"
-// TODO these defines should be moved to ../pugixml.hpp
-//   but when included pugixml.hpp(131): error RC2104: undefined keyword or key name: typedef
-# define PUGIXML_VERSION_MAJOR 1
-# define PUGIXML_VERSION_MINOR 10
-# define PUGIXML_VERSION_PATCH 0
-# define PUGIXML_VERSION_NUMBER "1.10.0\0"
+
+#define PUGIXML_VERSION_MAJOR 1
+#define PUGIXML_VERSION_MINOR 10
+#define PUGIXML_VERSION_PATCH 0
+#define PUGIXML_VERSION_NUMBER "1.10.0\0"
 
 #ifdef GCC_WINDRES
 VS_VERSION_INFO		VERSIONINFO