[REFACT] Removed pe_sieve_version.h from the includes

CMakeLists.txt

@@ -190,7 +190,7 @@ set (hdrs
 
 set (rsrc
 	resources.h
-	include/pe_sieve_ver_short.h
+	pe_sieve_ver_short.h
 	pe_sieve_res.rc
 )
 
@@ -214,7 +214,6 @@ SOURCE_GROUP("Header Files\\postprocessors\\imp_rec" FILES ${imprec_hdrs} )
 include(GNUInstallDirs)
 set (library_export_hdrs
 	include/pe_sieve_types.h
-	include/pe_sieve_version.h
 	include/pe_sieve_api.h
 	include/pe_sieve_return_codes.h
 )
@@ -244,7 +243,7 @@ if(PESIEVE_AS_STATIC_LIB OR PESIEVE_AS_DLL)
 		)
 	endif()
 
-	add_library ( ${PROJECT_NAME} ${LIBRARY_TYPE} ${library_export_hdrs} ${hdrs} ${lib_srcs} )
+	add_library ( ${PROJECT_NAME} ${LIBRARY_TYPE} ${library_export_hdrs} ${hdrs} ${lib_srcs} ${rsrc} )
 
 	set_source_files_properties(main.def PROPERTIES HEADER_FILE_ONLY TRUE)
 	target_compile_definitions(${PROJECT_NAME} PUBLIC PESIEVE_${LIBRARY_TYPE}_LIB)

include/pe_sieve_version.h

@@ -1,14 +0,0 @@
-#pragma once
-
-#include <windows.h>
-#include <pe_sieve_ver_short.h>
-
-#ifdef __cplusplus
-namespace pesieve {
-#endif
-	const DWORD PESIEVE_VERSION_ID = MAKELONG(MAKEWORD(PESIEVE_PATCH_VERSION, PESIEVE_MICRO_VERSION), MAKEWORD(PESIEVE_MINOR_VERSION, PESIEVE_MAJOR_VERSION));
-	const char PESIEVE_URL[] = "https://github.com/hasherezade/pe-sieve";
-
-#ifdef __cplusplus
-};
-#endif

pe_sieve.h

@@ -9,15 +9,17 @@
 #include <iostream>
 #include <stdexcept>
 
-#include <pe_sieve_version.h>
 #include <pe_sieve_types.h>
 #include <pe_sieve_return_codes.h>
 
+#include "pe_sieve_ver_short.h"
 #include "pe_sieve_report.h"
 #include "postprocessors/report_formatter.h"
 
 namespace pesieve {
 
+	const char PESIEVE_URL[] = "https://github.com/hasherezade/pe-sieve";
+
 	//! The string with the basic information about the scanner.
 	std::string info();
 

pe_sieve_api.cpp

@@ -75,4 +75,4 @@ void PESIEVE_API_FUNC PESieve_help(void)
 	MessageBox(NULL, my_info.c_str(), LIB_NAME, MB_ICONINFORMATION);
 }
 
-extern const DWORD PESIEVE_API PESieve_version = pesieve::PESIEVE_VERSION_ID;
+extern const DWORD PESIEVE_API PESieve_version = MAKELONG(MAKEWORD(PESIEVE_PATCH_VERSION, PESIEVE_MICRO_VERSION), MAKEWORD(PESIEVE_MINOR_VERSION, PESIEVE_MAJOR_VERSION));