Project settings in project files reworked.

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

diff --git a/CommonAPI-DBus.vcxproj b/CommonAPI-DBus.vcxproj
index 3176711..8fb18c3 100644 (file)
--- a/CommonAPI-DBus.vcxproj
+++ b/CommonAPI-DBus.vcxproj
@@ -22,7 +22,7 @@
     <CharacterSet>MultiByte</CharacterSet>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
-    <ConfigurationType>Application</ConfigurationType>\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
     <UseDebugLibraries>false</UseDebugLibraries>\r
     <PlatformToolset>v120</PlatformToolset>\r
     <WholeProgramOptimization>true</WholeProgramOptimization>\r
@@ -51,15 +51,14 @@
       <DebugInformationFormat>OldStyle</DebugInformationFormat>\r
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <AdditionalIncludeDirectories>$(COMMONAPI_DIR)\src;$(DBUS_BUILD_DIR);$(DBUS_DIR);$(SolutionDir)\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <MinimalRebuild>false</MinimalRebuild>\r
     </ClCompile>\r
     <Link>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <AdditionalLibraryDirectories>$(ProgramFiles)\dbus\bin\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <AdditionalOptions>/VERBOSE %(AdditionalOptions)</AdditionalOptions>\r
     </Link>\r
-    <Lib>\r
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>\r
-    </Lib>\r
+    <Lib />\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
@@ -69,6 +68,9 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
       <SDLCheck>true</SDLCheck>\r
       <AdditionalIncludeDirectories>$(COMMONAPI_DIR)\src;$(DBUS_BUILD_DIR);$(DBUS_DIR);$(SolutionDir)\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WIN32;COMMONAPI_INTERNAL_COMPILATION;COMMONAPI_DBUS_VERSION_MAJOR=2;COMMONAPI_DBUS_VERSION_MINOR=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <DebugInformationFormat>OldStyle</DebugInformationFormat>\r
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r

diff --git a/README b/README
index bc5fb08..e263841 100644 (file)
--- 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 (file)
--- a/UnitTests.vcxproj
+++ b/UnitTests.vcxproj
@@ -137,7 +137,7 @@
     <CLRSupport>false</CLRSupport>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
-    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
+    <ConfigurationType>Application</ConfigurationType>\r
     <UseDebugLibraries>false</UseDebugLibraries>\r
     <PlatformToolset>v120</PlatformToolset>\r
     <WholeProgramOptimization>true</WholeProgramOptimization>\r
@@ -158,9 +158,7 @@
     <LinkIncremental>true</LinkIncremental>\r
     <TargetName>$(ProjectName)d</TargetName>\r
   </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <LinkIncremental>true</LinkIncremental>\r
-  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
       <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
@@ -171,6 +169,7 @@
       <UseFullPaths>true</UseFullPaths>\r
       <ShowIncludes>true</ShowIncludes>\r
       <DebugInformationFormat>OldStyle</DebugInformationFormat>\r
+      <MinimalRebuild>false</MinimalRebuild>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Console</SubSystem>\r
@@ -182,17 +181,16 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
       <WarningLevel>Level3</WarningLevel>\r
-      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
       <Optimization>MaxSpeed</Optimization>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
       <AdditionalIncludeDirectories>$(DBUS_DIR);$(DBUS_BUILD_DIR);$(SolutionDir)\src;$(SolutionDir)\src\test;$(COMMONAPI_DIR)\src;$(GTEST)\include;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>ENABLE_ATTRIBUTE_EXTENSIONS;COMMONAPI_INTERNAL_COMPILATION;WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <UseFullPaths>true</UseFullPaths>\r
     </ClCompile>\r
     <Link>\r
-      <SubSystem>Windows</SubSystem>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Console</SubSystem>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
       <OptimizeReferences>true</OptimizeReferences>\r
       <AdditionalLibraryDirectories>$(DBUS_BUILD_DIR)\bin\Release;$(GTEST)\msvc\gtest-md\Release;$(COMMONAPI_DIR)\Release;$(SolutionDir)\Release;$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r