diff --git a/MSICA/stdafx.h b/MSICA/stdafx.h index 9a0137c..486e77f 100644 --- a/MSICA/stdafx.h +++ b/MSICA/stdafx.h @@ -4,25 +4,9 @@ #pragma once -#if defined(_UNICODE) && !defined(UNICODE) -#define UNICODE -#endif - -#if defined(_WIN32) && !defined(WIN32) -#define WIN32 -#endif - -#ifndef STRICT -#define STRICT -#endif - -#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers -#define _WIN32_WINNT 0x0501 // Include Windows XP symbols -#define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h #ifdef _WINDLL -#define MSICA_DLL // This is a DLL +#define MSICA_DLL // This library is compiled as a DLL #endif -#define _ATL_APARTMENT_THREADED #include #include diff --git a/MSICALib/stdafx.h b/MSICALib/stdafx.h index 1635444..e3b10de 100644 --- a/MSICALib/stdafx.h +++ b/MSICALib/stdafx.h @@ -4,25 +4,6 @@ #pragma once -#if defined(_UNICODE) && !defined(UNICODE) -#define UNICODE -#endif - -#if defined(_WIN32) && !defined(WIN32) -#define WIN32 -#endif - -#ifndef STRICT -#define STRICT -#endif - -#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers -#define _WIN32_WINNT 0x0501 // Include Windows XP symbols -#define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h -//#define _ATL_APARTMENT_THREADED -//#define _ATL_NO_AUTOMATIC_NAMESPACE -//#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // Some CString constructors will be explicit - #include #include #include diff --git a/include/common.props b/include/common.props index a1a49e6..09dfc50 100644 --- a/include/common.props +++ b/include/common.props @@ -10,7 +10,7 @@ Level3 - WIN32;%(PreprocessorDefinitions) + WIN32;STRICT;VC_EXTRALEAN;_WIN32_WINNT=0x0501;_WINSOCKAPI_;_ATL_APARTMENT_THREADED;%(PreprocessorDefinitions) Use stdafx.h ProgramDatabase diff --git a/include/version.h b/include/version.h index 3e5be20..90b1b1b 100644 --- a/include/version.h +++ b/include/version.h @@ -1,9 +1,9 @@ -#define MSICA_VERSION 0x00ff0200 +#define MSICA_VERSION 0x00ff0300 #define MSICA_VERSION_MAJ 0 #define MSICA_VERSION_MIN 255 -#define MSICA_VERSION_REV 2 +#define MSICA_VERSION_REV 3 #define MSICA_VERSION_BUILD 0 -#define MSICA_VERSION_STR "1.0-pre2" +#define MSICA_VERSION_STR "1.0-pre3" #define MSICA_BUILD_YEAR_STR "2014"