diff --git a/MSVC_Net2013/atkmm-build-defines.props b/MSVC_Net2013/atkmm-build-defines.props index 421f5c3..0275e6e 100644 --- a/MSVC_Net2013/atkmm-build-defines.props +++ b/MSVC_Net2013/atkmm-build-defines.props @@ -5,8 +5,6 @@ </ImportGroup> <PropertyGroup Label="UserMacros"> <AtkMMBuildDefs>ATKMM_BUILD</AtkMMBuildDefs> - <CPPDepLibsRelease>glibmm-vc$(VSVer)0-2_4.lib;sigc-vc$(VSVer)0-2_0.lib</CPPDepLibsRelease> - <CPPDepLibsDebug>glibmm-vc$(VSVer)0-d-2_4.lib;sigc-vc$(VSVer)0-d-2_0.lib</CPPDepLibsDebug> </PropertyGroup> <PropertyGroup> <_PropertySheetDisplayName>panogmmbuilddefinesprops</_PropertySheetDisplayName> @@ -15,25 +13,19 @@ </PropertyGroup> <ItemDefinitionGroup> <ClCompile> - <AdditionalIncludeDirectories>.\atkmm;..\atk;$(GlibEtcInstallRoot)\include\glibmm-2.4;$(GlibEtcInstallRoot)\lib\glibmm-2.4\include;$(GlibEtcInstallRoot)\include\sigc++-2.0;$(GlibEtcInstallRoot)\lib\sigc++-2.0\include;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.\atkmm;..\atk;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles> <MultiProcessorCompilation>true</MultiProcessorCompilation> <AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> - <AdditionalDependencies>atk-1.0.lib;gobject-2.0.lib;glib-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies> - <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> </Link> </ItemDefinitionGroup> <ItemGroup> <BuildMacro Include="AtkMMBuildDefs"> <Value>$(AtkMMBuildDefs)</Value> </BuildMacro> - <BuildMacro Include="CPPDepLibsRelease"> - <Value>$(CPPDepLibsRelease)</Value> - </BuildMacro> - <BuildMacro Include="CPPDepLibsDebug"> - <Value>$(CPPDepLibsDebug)</Value> - </BuildMacro> </ItemGroup> </Project> \ No newline at end of file diff --git a/MSVC_Net2013/atkmm-version-paths.props b/MSVC_Net2013/atkmm-version-paths.props index affd50f..675aa3e 100644 --- a/MSVC_Net2013/atkmm-version-paths.props +++ b/MSVC_Net2013/atkmm-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>6</ApiMinorVersion> - <ReleaseDllSuffix>-vc$(VSVer)0-$(ApiMajorVersion)_$(ApiMinorVersion)</ReleaseDllSuffix> - <DebugDllSuffix>-vc$(VSVer)0-d-$(ApiMajorVersion)_$(ApiMinorVersion)</DebugDllSuffix> </PropertyGroup> <PropertyGroup> <_PropertySheetDisplayName>atkmmversionpathsprops</_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 diff --git a/MSVC_Net2013/atkmm.vcxproj b/MSVC_Net2013/atkmm.vcxproj index c3db50a..40f21cb 100644 --- a/MSVC_Net2013/atkmm.vcxproj +++ b/MSVC_Net2013/atkmm.vcxproj @@ -41,7 +41,7 @@ </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> + <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> diff --git a/MSVC_Net2013/atkmm.vcxproj.filters b/MSVC_Net2013/atkmm.vcxproj.filters index f0fca22..6598996 100644 --- a/MSVC_Net2013/atkmm.vcxproj.filters +++ b/MSVC_Net2013/atkmm.vcxproj.filters @@ -15,55 +15,143 @@ </Filter> </ItemGroup> <ItemGroup> - <ClCompile Include="..\atk\atkmm\action.cc"><Filter>Source Files</Filter></ClCompile> - <ClCompile Include="..\atk\atkmm\component.cc"><Filter>Source Files</Filter></ClCompile> - <ClCompile Include="..\atk\atkmm\document.cc"><Filter>Source Files</Filter></ClCompile> - <ClCompile Include="..\atk\atkmm\editabletext.cc"><Filter>Source Files</Filter></ClCompile> - <ClCompile Include="..\atk\atkmm\hyperlink.cc"><Filter>Source Files</Filter></ClCompile> - <ClCompile Include="..\atk\atkmm\hypertext.cc"><Filter>Source Files</Filter></ClCompile> - <ClCompile Include="..\atk\atkmm\image.cc"><Filter>Source Files</Filter></ClCompile> - <ClCompile Include="..\atk\atkmm\implementor.cc"><Filter>Source Files</Filter></ClCompile> - <ClCompile Include="..\atk\atkmm\init.cc"><Filter>Source Files</Filter></ClCompile> - <ClCompile Include="..\atk\atkmm\noopobject.cc"><Filter>Source Files</Filter></ClCompile> - <ClCompile Include="..\atk\atkmm\object.cc"><Filter>Source Files</Filter></ClCompile> - <ClCompile Include="..\atk\atkmm\objectaccessible.cc"><Filter>Source Files</Filter></ClCompile> - <ClCompile Include="..\atk\atkmm\range.cc"><Filter>Source Files</Filter></ClCompile> - <ClCompile Include="..\atk\atkmm\relation.cc"><Filter>Source Files</Filter></ClCompile> - <ClCompile Include="..\atk\atkmm\relationset.cc"><Filter>Source Files</Filter></ClCompile> - <ClCompile Include="..\atk\atkmm\selection.cc"><Filter>Source Files</Filter></ClCompile> - <ClCompile Include="..\atk\atkmm\stateset.cc"><Filter>Source Files</Filter></ClCompile> - <ClCompile Include="..\atk\atkmm\streamablecontent.cc"><Filter>Source Files</Filter></ClCompile> - <ClCompile Include="..\atk\atkmm\table.cc"><Filter>Source Files</Filter></ClCompile> - <ClCompile Include="..\atk\atkmm\text.cc"><Filter>Source Files</Filter></ClCompile> - <ClCompile Include="..\atk\atkmm\value.cc"><Filter>Source Files</Filter></ClCompile> - <ClCompile Include="..\atk\atkmm\wrap_init.cc"><Filter>Source Files</Filter></ClCompile> + <ClCompile Include="..\atk\atkmm\action.cc"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\atk\atkmm\component.cc"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\atk\atkmm\document.cc"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\atk\atkmm\editabletext.cc"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\atk\atkmm\hyperlink.cc"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\atk\atkmm\hypertext.cc"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\atk\atkmm\image.cc"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\atk\atkmm\implementor.cc"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\atk\atkmm\init.cc"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\atk\atkmm\noopobject.cc"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\atk\atkmm\object.cc"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\atk\atkmm\objectaccessible.cc"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\atk\atkmm\range.cc"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\atk\atkmm\relation.cc"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\atk\atkmm\relationset.cc"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\atk\atkmm\selection.cc"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\atk\atkmm\stateset.cc"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\atk\atkmm\streamablecontent.cc"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\atk\atkmm\table.cc"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\atk\atkmm\text.cc"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\atk\atkmm\value.cc"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\atk\atkmm\wrap_init.cc"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> - <ClInclude Include="..\atk\atkmm\action.h"><Filter>Header Files</Filter></ClInclude> - <ClInclude Include="..\atk\atkmm\component.h"><Filter>Header Files</Filter></ClInclude> - <ClInclude Include="..\atk\atkmm\document.h"><Filter>Header Files</Filter></ClInclude> - <ClInclude Include="..\atk\atkmm\editabletext.h"><Filter>Header Files</Filter></ClInclude> - <ClInclude Include="..\atk\atkmm\hyperlink.h"><Filter>Header Files</Filter></ClInclude> - <ClInclude Include="..\atk\atkmm\hypertext.h"><Filter>Header Files</Filter></ClInclude> - <ClInclude Include="..\atk\atkmm\image.h"><Filter>Header Files</Filter></ClInclude> - <ClInclude Include="..\atk\atkmm\implementor.h"><Filter>Header Files</Filter></ClInclude> - <ClInclude Include="..\atk\atkmm\init.h"><Filter>Header Files</Filter></ClInclude> - <ClInclude Include="..\atk\atkmm\noopobject.h"><Filter>Header Files</Filter></ClInclude> - <ClInclude Include="..\atk\atkmm\object.h"><Filter>Header Files</Filter></ClInclude> - <ClInclude Include="..\atk\atkmm\objectaccessible.h"><Filter>Header Files</Filter></ClInclude> - <ClInclude Include="..\atk\atkmm\range.h"><Filter>Header Files</Filter></ClInclude> - <ClInclude Include="..\atk\atkmm\relation.h"><Filter>Header Files</Filter></ClInclude> - <ClInclude Include="..\atk\atkmm\relationset.h"><Filter>Header Files</Filter></ClInclude> - <ClInclude Include="..\atk\atkmm\selection.h"><Filter>Header Files</Filter></ClInclude> - <ClInclude Include="..\atk\atkmm\stateset.h"><Filter>Header Files</Filter></ClInclude> - <ClInclude Include="..\atk\atkmm\streamablecontent.h"><Filter>Header Files</Filter></ClInclude> - <ClInclude Include="..\atk\atkmm\table.h"><Filter>Header Files</Filter></ClInclude> - <ClInclude Include="..\atk\atkmm\text.h"><Filter>Header Files</Filter></ClInclude> - <ClInclude Include="..\atk\atkmm\value.h"><Filter>Header Files</Filter></ClInclude> - <ClInclude Include="..\atk\atkmm\wrap_init.h"><Filter>Header Files</Filter></ClInclude> + <ClInclude Include="..\atk\atkmm\action.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\atk\atkmm\component.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\atk\atkmm\document.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\atk\atkmm\editabletext.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\atk\atkmm\hyperlink.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\atk\atkmm\hypertext.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\atk\atkmm\image.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\atk\atkmm\implementor.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\atk\atkmm\init.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\atk\atkmm\noopobject.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\atk\atkmm\object.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\atk\atkmm\objectaccessible.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\atk\atkmm\range.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\atk\atkmm\relation.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\atk\atkmm\relationset.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\atk\atkmm\selection.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\atk\atkmm\stateset.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\atk\atkmm\streamablecontent.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\atk\atkmm\table.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\atk\atkmm\text.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\atk\atkmm\value.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\atk\atkmm\wrap_init.h"> + <Filter>Header Files</Filter> + </ClInclude> </ItemGroup> <ItemGroup> - <ResourceCompile Include="atkmm.rc"> + <ResourceCompile Include=".\atkmm\atkmm.rc"> <Filter>Resource Files</Filter> </ResourceCompile> </ItemGroup> diff --git a/MSVC_Net2013/gendef.vcxproj b/MSVC_Net2013/gendef.vcxproj index 554054c..d6f2798 100644 --- a/MSVC_Net2013/gendef.vcxproj +++ b/MSVC_Net2013/gendef.vcxproj @@ -40,7 +40,7 @@ </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> + <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />