modified vcxproj file of CommonAPI-DBus to now use environment variables and relative paths, adapted README accordingly

2 files changed, 5 insertions, 4 deletions

diff --git a/CommonAPI-DBus.vcxproj b/CommonAPI-DBus.vcxproj
index d039d58..f4fba1a 100644
--- a/CommonAPI-DBus.vcxproj
+++ b/CommonAPI-DBus.vcxproj
@@ -39,8 +39,8 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

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

-    <IncludePath>$(ProjectDir)\src;C:\work\bmw\2.0\dbus;C:\work\bmw\vs21\Common-API\src\;$(IncludePath)</IncludePath>

-    <LibraryPath>C:\work\bmw\vs21\Common-API\Debug;$(LibraryPath)</LibraryPath>

+    <IncludePath>$(ProjectDir)\src;..\ascgit017.CommonAPI\src;$(DBUS_DIR);$(DBUS_BUILD_DIR);$(IncludePath)</IncludePath>

+    <LibraryPath>..\ascgit017.CommonAPI\Debug;$(LibraryPath)</LibraryPath>

   </PropertyGroup>

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

     <ClCompile>

@@ -51,6 +51,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <DebugInformationFormat>OldStyle</DebugInformationFormat>

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

+      <AdditionalOptions>/VERBOSE /VERBOSE:LIB %(AdditionalOptions)</AdditionalOptions>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -98,7 +99,6 @@
     <ClCompile Include="src\CommonAPI\DBus\DBusRuntime.cpp" />

     <ClCompile Include="src\CommonAPI\DBus\DBusServicePublisher.cpp" />

     <ClCompile Include="src\CommonAPI\DBus\DBusServiceRegistry.cpp" />

-    <ClCompile Include="src\CommonAPI\DBus\DBusServiceStatusEvent.cpp" />

     <ClCompile Include="src\CommonAPI\DBus\DBusStubAdapter.cpp" />

     <ClCompile Include="src\murmurhash\MurmurHash3.cpp" />

     <ClCompile Include="src\pugixml\pugixml.cpp" />

@@ -138,7 +138,6 @@
     <ClInclude Include="src\CommonAPI\DBus\DBusSerializableArguments.h" />

     <ClInclude Include="src\CommonAPI\DBus\DBusServicePublisher.h" />

     <ClInclude Include="src\CommonAPI\DBus\DBusServiceRegistry.h" />

-    <ClInclude Include="src\CommonAPI\DBus\DBusServiceStatusEvent.h" />

     <ClInclude Include="src\CommonAPI\DBus\DBusStubAdapter.h" />

     <ClInclude Include="src\CommonAPI\DBus\DBusStubAdapterHelper.h" />

     <ClInclude Include="src\CommonAPI\DBus\DBusUtils.h" />

diff --git a/README b/README
index 9d86af5..2573b3c 100644
--- a/README
+++ b/README
@@ -82,6 +82,8 @@ Use autotools to build this package withthe above requirements available through
 # sudo make install (or alternative install process, eg. checkinstall on debian-based distributions, such as Ubuntu)
 ----
 To build the Windows version with Visual Studio, you can use the solution file CommonAPI-DBus.sln. It is configured to build CommonAPI-DBus as a static library.
+Set the environment variable DBUS_DIR to the directory containing your patched DBus sources.
+Set the environment variable DBUS_BUILD_DIR to the directory containing your built DBus.
 Add the path of CommonAPI.lib to "Additional Library Directories"
 
 == Linking against CommonAPI-D-Bus