Skip to content

Commit

Permalink
removed old project dependencies, libpng and zlib static libraries,
Browse files Browse the repository at this point in the history
removed png headers,
fixed project references,
added x64 platform for libcalc2dio
  • Loading branch information
carasuca committed Dec 1, 2012
1 parent 3ad40bd commit d0506e5
Show file tree
Hide file tree
Showing 10 changed files with 85 additions and 3,465 deletions.
6 changes: 4 additions & 2 deletions Calculation2D.sln
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,12 @@ Global
{8879B4A9-91B5-44C4-BC21-CD9737B3D37B}.Release|x64.Build.0 = Release|x64
{A566B21B-3AA1-476A-BEA4-4641F4919371}.Debug|Win32.ActiveCfg = Debug|Win32
{A566B21B-3AA1-476A-BEA4-4641F4919371}.Debug|Win32.Build.0 = Debug|Win32
{A566B21B-3AA1-476A-BEA4-4641F4919371}.Debug|x64.ActiveCfg = Debug|Win32
{A566B21B-3AA1-476A-BEA4-4641F4919371}.Debug|x64.ActiveCfg = Debug|x64
{A566B21B-3AA1-476A-BEA4-4641F4919371}.Debug|x64.Build.0 = Debug|x64
{A566B21B-3AA1-476A-BEA4-4641F4919371}.Release|Win32.ActiveCfg = Release|Win32
{A566B21B-3AA1-476A-BEA4-4641F4919371}.Release|Win32.Build.0 = Release|Win32
{A566B21B-3AA1-476A-BEA4-4641F4919371}.Release|x64.ActiveCfg = Release|Win32
{A566B21B-3AA1-476A-BEA4-4641F4919371}.Release|x64.ActiveCfg = Release|x64
{A566B21B-3AA1-476A-BEA4-4641F4919371}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
18 changes: 10 additions & 8 deletions proj/calc2dcmd/calc2dcmd.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(SolutionDir)lib\$(Configuration); lib</AdditionalLibraryDirectories>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);libcalc2d.lib;libcalc2dserialize.lib; libpng15.lib; zlib.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)lib\$(Configuration)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
Expand All @@ -106,8 +105,7 @@
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(SolutionDir)lib\$(Platform)\$(Configuration)\; lib\$(Platform)\</AdditionalLibraryDirectories>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);libcalc2d.lib;libcalc2dserialize.lib; libpng15.lib; zlib.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)lib\$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand All @@ -126,8 +124,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>$(SolutionDir)lib\$(Configuration); lib</AdditionalLibraryDirectories>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);libcalc2d.lib;libcalc2dserialize.lib; libpng15.lib; zlib.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)lib\$(Configuration)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
Expand All @@ -146,8 +143,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);libcalc2d.lib;libcalc2dserialize.lib; libpng15.lib; zlib.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)lib\$(Platform)\$(Configuration)\; lib\$(Platform)\</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)lib\$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Expand Down Expand Up @@ -183,6 +179,12 @@
<ProjectReference Include="..\libcalc2dio\libcalc2dio.vcxproj">
<Project>{a566b21b-3aa1-476a-bea4-4641f4919371}</Project>
</ProjectReference>
<ProjectReference Include="..\libcalc2dserialize\libcalc2dserialize.vcxproj">
<Project>{8879b4a9-91b5-44c4-bc21-cd9737b3d37b}</Project>
</ProjectReference>
<ProjectReference Include="..\libcalc2d\libcalc2d.vcxproj">
<Project>{81764a51-4b0f-4310-acd1-059bfc9bedde}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Expand Down
Binary file removed proj/calc2dcmd/lib/libpng15.lib
Binary file not shown.
Binary file removed proj/calc2dcmd/lib/x64/libpng15.lib
Binary file not shown.
Binary file removed proj/calc2dcmd/lib/x64/zlib.lib
Binary file not shown.
Binary file removed proj/calc2dcmd/lib/zlib.lib
Binary file not shown.
Loading

0 comments on commit d0506e5

Please sign in to comment.