Nastavitve konstant sem preselil v common.props.

Verzijo sem nastavil na 1.0-pre3.
This commit is contained in:
Simon Rozman 2014-05-13 07:51:02 +00:00
parent 6c78a47bda
commit ce3226b483
4 changed files with 5 additions and 40 deletions

View File

@ -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 <atlbase.h>
#include <atlfile.h>

View File

@ -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 <atlbase.h>
#include <atlfile.h>
#include <atlstr.h>

View File

@ -10,7 +10,7 @@
<ItemDefinitionGroup>
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;STRICT;VC_EXTRALEAN;_WIN32_WINNT=0x0501;_WINSOCKAPI_;_ATL_APARTMENT_THREADED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

View File

@ -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"