Project settings in project files reworked.

Release build is possible now.
Information about dbus-1.dll added in README.

3 files changed, 13 insertions, 13 deletions

diff --git a/CommonAPI-DBus.vcxproj b/CommonAPI-DBus.vcxproj
index 3176711..8fb18c3 100644
--- a/CommonAPI-DBus.vcxproj
+++ b/CommonAPI-DBus.vcxproj
@@ -22,7 +22,7 @@
     <CharacterSet>MultiByte</CharacterSet>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

+    <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v120</PlatformToolset>

     <WholeProgramOptimization>true</WholeProgramOptimization>

@@ -51,15 +51,14 @@
       <DebugInformationFormat>OldStyle</DebugInformationFormat>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

       <AdditionalIncludeDirectories>$(COMMONAPI_DIR)\src;$(DBUS_BUILD_DIR);$(DBUS_DIR);$(SolutionDir)\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <MinimalRebuild>false</MinimalRebuild>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <AdditionalLibraryDirectories>$(ProgramFiles)\dbus\bin\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <AdditionalOptions>/VERBOSE %(AdditionalOptions)</AdditionalOptions>

     </Link>

-    <Lib>

-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

-    </Lib>

+    <Lib />

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

@@ -69,6 +68,9 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>

       <SDLCheck>true</SDLCheck>

       <AdditionalIncludeDirectories>$(COMMONAPI_DIR)\src;$(DBUS_BUILD_DIR);$(DBUS_DIR);$(SolutionDir)\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;COMMONAPI_INTERNAL_COMPILATION;COMMONAPI_DBUS_VERSION_MAJOR=2;COMMONAPI_DBUS_VERSION_MINOR=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <DebugInformationFormat>OldStyle</DebugInformationFormat>

+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

diff --git a/README b/README
index bc5fb08..e263841 100644
--- a/README
+++ b/README
@@ -112,7 +112,7 @@ DBUS_DIR: directory containing the patched DBus sources e.g. <path_to_folder>\db
 DBUS_BUILD_DIR: directory containing the build DBus e.g. <path_to_folder>\dbus-1.8.0\dbus-build-dir
 COMMONAPI_DIR: directory containing the CommonAPI e.g. <path_to_folder>\ascgit017.CommonAPI
 
-To run the tests, you need to add the location of your built dbus-1d.dll to the PATH environment variable.
+To run the tests, you need to add the location of your built dbus-1d.dll or dbus-1.dll (depending on Debug or Release built) to the PATH environment variable.
 Please note:
 For building the tests the environment variable GTEST must be set (see README of CommonAPI).
 Furthermore the files DemoPoll.h and DemoPoll.cpp are needed (part of gnulib).
diff --git a/UnitTests.vcxproj b/UnitTests.vcxproj
index 5c5ad0e..f788db5 100644
--- a/UnitTests.vcxproj
+++ b/UnitTests.vcxproj
@@ -137,7 +137,7 @@
     <CLRSupport>false</CLRSupport>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v120</PlatformToolset>

     <WholeProgramOptimization>true</WholeProgramOptimization>

@@ -158,9 +158,7 @@
     <LinkIncremental>true</LinkIncremental>

     <TargetName>$(ProjectName)d</TargetName>

   </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <LinkIncremental>true</LinkIncremental>

-  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <PrecompiledHeader>NotUsing</PrecompiledHeader>

@@ -171,6 +169,7 @@
       <UseFullPaths>true</UseFullPaths>

       <ShowIncludes>true</ShowIncludes>

       <DebugInformationFormat>OldStyle</DebugInformationFormat>

+      <MinimalRebuild>false</MinimalRebuild>

     </ClCompile>

     <Link>

       <SubSystem>Console</SubSystem>

@@ -182,17 +181,16 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

       <WarningLevel>Level3</WarningLevel>

-      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeader>NotUsing</PrecompiledHeader>

       <Optimization>MaxSpeed</Optimization>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <IntrinsicFunctions>true</IntrinsicFunctions>

       <AdditionalIncludeDirectories>$(DBUS_DIR);$(DBUS_BUILD_DIR);$(SolutionDir)\src;$(SolutionDir)\src\test;$(COMMONAPI_DIR)\src;$(GTEST)\include;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>ENABLE_ATTRIBUTE_EXTENSIONS;COMMONAPI_INTERNAL_COMPILATION;WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <UseFullPaths>true</UseFullPaths>

     </ClCompile>

     <Link>

-      <SubSystem>Windows</SubSystem>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

       <AdditionalLibraryDirectories>$(DBUS_BUILD_DIR)\bin\Release;$(GTEST)\msvc\gtest-md\Release;$(COMMONAPI_DIR)\Release;$(SolutionDir)\Release;$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>