diff --git a/MSVC_Net2013/pangomm-build-defines.props b/MSVC_Net2013/pangomm-build-defines.props index 3c3108d..f30890b 100644 --- a/MSVC_Net2013/pangomm-build-defines.props +++ b/MSVC_Net2013/pangomm-build-defines.props @@ -5,8 +5,6 @@ </ImportGroup> <PropertyGroup Label="UserMacros"> <PangoMMBuildDefs>PANGOMM_BUILD</PangoMMBuildDefs> - <CPPDepLibsRelease>glibmm-vc$(VSVer)0-2_4.lib;cairomm-vc$(VSVer)0-1_0.lib;sigc-vc$(VSVer)0-2_0.lib</CPPDepLibsRelease> - <CPPDepLibsDebug>glibmm-vc$(VSVer)0-d-2_4.lib;cairomm-vc$(VSVer)0-d-1_0.lib;sigc-vc$(VSVer)0-d-2_0.lib</CPPDepLibsDebug> </PropertyGroup> <PropertyGroup> <_PropertySheetDisplayName>panogmmbuilddefinesprops</_PropertySheetDisplayName> @@ -15,14 +13,14 @@ </PropertyGroup> <ItemDefinitionGroup> <ClCompile> - <AdditionalIncludeDirectories>.\pangomm;..\pango;$(GlibEtcInstallRoot)\include\glibmm-2.4;$(GlibEtcInstallRoot)\lib\glibmm-2.4\include;$(GlibEtcInstallRoot)\include\cairomm-1.0;$(GlibEtcInstallRoot)\lib\cairomm-1.0\include;$(GlibEtcInstallRoot)\include\sigc++-2.0;$(GlibEtcInstallRoot)\lib\sigc++-2.0\include;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\pangomm;..\pango;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles> <MultiProcessorCompilation>true</MultiProcessorCompilation> <AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> - <AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;gobject-2.0.lib;gmodule-2.0.lib;glib-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies> - <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/MSVC_Net2013/pangomm-version-paths.props b/MSVC_Net2013/pangomm-version-paths.props index b287629..01a267e 100644 --- a/MSVC_Net2013/pangomm-version-paths.props +++ b/MSVC_Net2013/pangomm-version-paths.props @@ -2,13 +2,9 @@ <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Label="UserMacros"> <VSVer>12</VSVer> - <GlibEtcInstallRoot>$(SolutionDir)\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> - <CopyDir>$(GlibEtcInstallRoot)</CopyDir> <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)\</DefDir> <ApiMajorVersion>1</ApiMajorVersion> <ApiMinorVersion>4</ApiMinorVersion> - <ReleaseDllSuffix>-vc$(VSVer)0-$(ApiMajorVersion)_$(ApiMinorVersion)</ReleaseDllSuffix> - <DebugDllSuffix>-vc$(VSVer)0-d-$(ApiMajorVersion)_$(ApiMinorVersion)</DebugDllSuffix> </PropertyGroup> <PropertyGroup> <_PropertySheetDisplayName>pangommversionpathsprops</_PropertySheetDisplayName> @@ -17,12 +13,6 @@ <BuildMacro Include="VSVer"> <Value>$(VSVer)</Value> </BuildMacro> - <BuildMacro Include="GlibEtcInstallRoot"> - <Value>$(GlibEtcInstallRoot)</Value> - </BuildMacro> - <BuildMacro Include="CopyDir"> - <Value>$(CopyDir)</Value> - </BuildMacro> <BuildMacro Include="DefDir"> <Value>$(DefDir)</Value> </BuildMacro> @@ -32,11 +22,5 @@ <BuildMacro Include="ApiMinorVersion"> <Value>$(ApiMinorVersion)</Value> </BuildMacro> - <BuildMacro Include="ReleaseDllSuffix"> - <Value>$(ReleaseDllSuffix)</Value> - </BuildMacro> - <BuildMacro Include="DebugDllSuffix"> - <Value>$(DebugDllSuffix)</Value> - </BuildMacro> </ItemGroup> </Project> \ No newline at end of file