diff options
34 files changed, 46 insertions, 46 deletions
diff --git a/mak.vc8/cd.vcproj b/mak.vc8/cd.vcproj index 6d328e6..2abc61f 100644 --- a/mak.vc8/cd.vcproj +++ b/mak.vc8/cd.vcproj @@ -66,7 +66,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\cd.lib" + OutputFile="$(OutDir)/$(ProjectName).lib" SuppressStartupBanner="true" /> <Tool diff --git a/mak.vc8/cd_freetype.vcproj b/mak.vc8/cd_freetype.vcproj index a00ea3c..eafc33b 100644 --- a/mak.vc8/cd_freetype.vcproj +++ b/mak.vc8/cd_freetype.vcproj @@ -66,7 +66,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\freetype6.lib" + OutputFile="$(OutDir)/$(ProjectName).lib" SuppressStartupBanner="true" /> <Tool diff --git a/mak.vc8/cd_pdflib.vcproj b/mak.vc8/cd_pdflib.vcproj index f9a2bba..807d2c7 100644 --- a/mak.vc8/cd_pdflib.vcproj +++ b/mak.vc8/cd_pdflib.vcproj @@ -68,7 +68,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pdflib.lib" + OutputFile="$(OutDir)/$(ProjectName).lib" SuppressStartupBanner="true" /> <Tool diff --git a/mak.vc8/cdgdiplus.vcproj b/mak.vc8/cdgdiplus.vcproj index bf3e1d5..9b71790 100644 --- a/mak.vc8/cdgdiplus.vcproj +++ b/mak.vc8/cdgdiplus.vcproj @@ -66,7 +66,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\cdcontextplus.lib" + OutputFile="$(OutDir)/cdcontextplus.lib" SuppressStartupBanner="true" /> <Tool diff --git a/mak.vc8/cdgdk.vcproj b/mak.vc8/cdgdk.vcproj index 2c6189f..eb4514c 100644 --- a/mak.vc8/cdgdk.vcproj +++ b/mak.vc8/cdgdk.vcproj @@ -66,7 +66,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\cdgdk.lib" + OutputFile="$(OutDir)/$(ProjectName).lib" SuppressStartupBanner="true" /> <Tool diff --git a/mak.vc8/cdlua3.vcproj b/mak.vc8/cdlua3.vcproj index 2cac691..07a2fa0 100644 --- a/mak.vc8/cdlua3.vcproj +++ b/mak.vc8/cdlua3.vcproj @@ -66,7 +66,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\cdlua3.lib" + OutputFile="$(OutDir)/$(ProjectName).lib" SuppressStartupBanner="true" /> <Tool diff --git a/mak.vc8/cdlua5.vcproj b/mak.vc8/cdlua5.vcproj index d1bdad4..329e056 100644 --- a/mak.vc8/cdlua5.vcproj +++ b/mak.vc8/cdlua5.vcproj @@ -66,7 +66,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\cdlua51.lib" + OutputFile="$(OutDir)/$(ProjectName)1.lib" SuppressStartupBanner="true" /> <Tool diff --git a/mak.vc8/cdluacontextplus5.vcproj b/mak.vc8/cdluacontextplus5.vcproj index 5dd8a18..392ad5c 100644 --- a/mak.vc8/cdluacontextplus5.vcproj +++ b/mak.vc8/cdluacontextplus5.vcproj @@ -65,7 +65,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\cdluacontextplus51.lib" + OutputFile="$(OutDir)/$(ProjectName)1.lib" SuppressStartupBanner="true" /> <Tool diff --git a/mak.vc8/cdluaim5.vcproj b/mak.vc8/cdluaim5.vcproj index 9e403bb..91b8fd7 100644 --- a/mak.vc8/cdluaim5.vcproj +++ b/mak.vc8/cdluaim5.vcproj @@ -69,7 +69,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\cdluaim51.lib" + OutputFile="$(OutDir)/$(ProjectName)1.lib" SuppressStartupBanner="true" /> <Tool diff --git a/mak.vc8/cdluapdf3.vcproj b/mak.vc8/cdluapdf3.vcproj index 5b53aed..85a3949 100644 --- a/mak.vc8/cdluapdf3.vcproj +++ b/mak.vc8/cdluapdf3.vcproj @@ -65,7 +65,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\cdluapdf3.lib" + OutputFile="$(OutDir)/$(ProjectName).lib" SuppressStartupBanner="true" /> <Tool diff --git a/mak.vc8/cdluapdf5.vcproj b/mak.vc8/cdluapdf5.vcproj index 037253a..ee0f991 100644 --- a/mak.vc8/cdluapdf5.vcproj +++ b/mak.vc8/cdluapdf5.vcproj @@ -65,7 +65,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\cdluapdf51.lib" + OutputFile="$(OutDir)/$(ProjectName)1.lib" SuppressStartupBanner="true" /> <Tool diff --git a/mak.vc8/cdpdf.vcproj b/mak.vc8/cdpdf.vcproj index 5294637..cd3a618 100644 --- a/mak.vc8/cdpdf.vcproj +++ b/mak.vc8/cdpdf.vcproj @@ -67,7 +67,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\cdpdf.lib" + OutputFile="$(OutDir)/$(ProjectName).lib" SuppressStartupBanner="true" /> <Tool diff --git a/mak.vc8/cdsimple.vcproj b/mak.vc8/cdsimple.vcproj index 2d77d87..4dd1a7e 100644 --- a/mak.vc8/cdsimple.vcproj +++ b/mak.vc8/cdsimple.vcproj @@ -71,12 +71,12 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" AdditionalDependencies="freetype6.lib cd.lib iupcd.lib iup.lib comctl32.lib cdcontextplus.lib gdiplus.lib cdpdf.lib pdflib.lib iupcontrols.lib" - OutputFile="..\bin/cdsimple.exe" - LinkIncremental="2" + OutputFile="$(OutDir)\$(ProjectName).exe" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\lib,..\..\iup\lib" GenerateDebugInformation="true" - ProgramDatabaseFile="..\bin/cdsimple.pdb" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" SubSystem="1" RandomizedBaseAddress="1" DataExecutionPrevention="0" diff --git a/mak.vc8/cdsimplegdk.vcproj b/mak.vc8/cdsimplegdk.vcproj index 7d74fac..a98f8da 100644 --- a/mak.vc8/cdsimplegdk.vcproj +++ b/mak.vc8/cdsimplegdk.vcproj @@ -71,12 +71,12 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" AdditionalDependencies="gtk-win32-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib pangowin32-1.0.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib freetype6.lib cd.lib iupcd.lib iupgtk.lib comctl32.lib cdcontextplus.lib gdiplus.lib cdpdf.lib pdflib.lib iupcontrols.lib" - OutputFile="..\bin/cdsimplegdk.exe" - LinkIncremental="2" + OutputFile="$(OutDir)\$(ProjectName).exe" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\lib,..\..\iup\lib;d:\lng\gtk\lib" GenerateDebugInformation="true" - ProgramDatabaseFile="..\bin/cdsimplegdk.pdb" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" SubSystem="1" RandomizedBaseAddress="1" DataExecutionPrevention="0" diff --git a/mak.vc8/cdtest.vcproj b/mak.vc8/cdtest.vcproj index 9ad8337..383cfca 100644 --- a/mak.vc8/cdtest.vcproj +++ b/mak.vc8/cdtest.vcproj @@ -75,12 +75,12 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" AdditionalDependencies="freetype6.lib comctl32.lib cd.lib iupcd.lib cdcontextplus.lib iup.lib gdiplus.lib cdpdf.lib pdflib.lib" - OutputFile="..\bin/cdtest.exe" - LinkIncremental="2" + OutputFile="$(OutDir)\$(ProjectName).exe" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\lib,..\..\iup\lib" GenerateDebugInformation="true" - ProgramDatabaseFile="..\bin/cdtest.pdb" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" SubSystem="1" /> <Tool diff --git a/mak.vc8/cdx11.vcproj b/mak.vc8/cdx11.vcproj index c30fa0c..5b7d433 100644 --- a/mak.vc8/cdx11.vcproj +++ b/mak.vc8/cdx11.vcproj @@ -66,7 +66,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\cdx11.lib" + OutputFile="$(OutDir)/$(ProjectName).lib" SuppressStartupBanner="true" /> <Tool diff --git a/mak.vc8/cdxrender.vcproj b/mak.vc8/cdxrender.vcproj index 1924d07..05c9662 100644 --- a/mak.vc8/cdxrender.vcproj +++ b/mak.vc8/cdxrender.vcproj @@ -66,7 +66,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\cdxrender.lib" + OutputFile="$(OutDir)/$(ProjectName).lib" SuppressStartupBanner="true" /> <Tool diff --git a/mak.vc9/cd.vcproj b/mak.vc9/cd.vcproj index 20aad6f..383787f 100644 --- a/mak.vc9/cd.vcproj +++ b/mak.vc9/cd.vcproj @@ -66,7 +66,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\cd.lib" + OutputFile="$(OutDir)/$(ProjectName).lib" SuppressStartupBanner="true" /> <Tool diff --git a/mak.vc9/cd_freetype.vcproj b/mak.vc9/cd_freetype.vcproj index ee8d256..7795eb3 100644 --- a/mak.vc9/cd_freetype.vcproj +++ b/mak.vc9/cd_freetype.vcproj @@ -66,7 +66,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\freetype6.lib" + OutputFile="$(OutDir)/$(ProjectName).lib" SuppressStartupBanner="true" /> <Tool diff --git a/mak.vc9/cd_pdflib.vcproj b/mak.vc9/cd_pdflib.vcproj index 7495fe7..86f5c68 100644 --- a/mak.vc9/cd_pdflib.vcproj +++ b/mak.vc9/cd_pdflib.vcproj @@ -68,7 +68,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pdflib.lib" + OutputFile="$(OutDir)/$(ProjectName).lib" SuppressStartupBanner="true" /> <Tool diff --git a/mak.vc9/cdgdiplus.vcproj b/mak.vc9/cdgdiplus.vcproj index 6622c27..87ad217 100644 --- a/mak.vc9/cdgdiplus.vcproj +++ b/mak.vc9/cdgdiplus.vcproj @@ -66,7 +66,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\cdcontextplus.lib" + OutputFile="$(OutDir)/cdcontextplus.lib" SuppressStartupBanner="true" /> <Tool diff --git a/mak.vc9/cdgdk.vcproj b/mak.vc9/cdgdk.vcproj index 083de2c..ccd0e78 100644 --- a/mak.vc9/cdgdk.vcproj +++ b/mak.vc9/cdgdk.vcproj @@ -66,7 +66,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\cdgdk.lib" + OutputFile="$(OutDir)/$(ProjectName).lib" SuppressStartupBanner="true" /> <Tool diff --git a/mak.vc9/cdlua3.vcproj b/mak.vc9/cdlua3.vcproj index a2ff74f..ba77c62 100644 --- a/mak.vc9/cdlua3.vcproj +++ b/mak.vc9/cdlua3.vcproj @@ -66,7 +66,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\cdlua3.lib" + OutputFile="$(OutDir)/$(ProjectName).lib" SuppressStartupBanner="true" /> <Tool diff --git a/mak.vc9/cdlua5.vcproj b/mak.vc9/cdlua5.vcproj index f07bbad..625275a 100644 --- a/mak.vc9/cdlua5.vcproj +++ b/mak.vc9/cdlua5.vcproj @@ -66,7 +66,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\cdlua51.lib" + OutputFile="$(OutDir)/$(ProjectName)1.lib" SuppressStartupBanner="true" /> <Tool diff --git a/mak.vc9/cdluacontextplus5.vcproj b/mak.vc9/cdluacontextplus5.vcproj index ca5093d..a595c8d 100644 --- a/mak.vc9/cdluacontextplus5.vcproj +++ b/mak.vc9/cdluacontextplus5.vcproj @@ -65,7 +65,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\cdluacontextplus51.lib" + OutputFile="$(OutDir)/$(ProjectName)1.lib" SuppressStartupBanner="true" /> <Tool diff --git a/mak.vc9/cdluaim5.vcproj b/mak.vc9/cdluaim5.vcproj index 7cd2cd9..af1b2f3 100644 --- a/mak.vc9/cdluaim5.vcproj +++ b/mak.vc9/cdluaim5.vcproj @@ -69,7 +69,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\cdluaim51.lib" + OutputFile="$(OutDir)/$(ProjectName)1.lib" SuppressStartupBanner="true" /> <Tool diff --git a/mak.vc9/cdluapdf3.vcproj b/mak.vc9/cdluapdf3.vcproj index a24a4dc..e14f092 100644 --- a/mak.vc9/cdluapdf3.vcproj +++ b/mak.vc9/cdluapdf3.vcproj @@ -65,7 +65,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\cdluapdf3.lib" + OutputFile="$(OutDir)/$(ProjectName).lib" SuppressStartupBanner="true" /> <Tool diff --git a/mak.vc9/cdluapdf5.vcproj b/mak.vc9/cdluapdf5.vcproj index 54537b1..28da040 100644 --- a/mak.vc9/cdluapdf5.vcproj +++ b/mak.vc9/cdluapdf5.vcproj @@ -65,7 +65,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\cdluapdf51.lib" + OutputFile="$(OutDir)/$(ProjectName)1.lib" SuppressStartupBanner="true" /> <Tool diff --git a/mak.vc9/cdpdf.vcproj b/mak.vc9/cdpdf.vcproj index 3c58eb1..503f4e3 100644 --- a/mak.vc9/cdpdf.vcproj +++ b/mak.vc9/cdpdf.vcproj @@ -67,7 +67,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\cdpdf.lib" + OutputFile="$(OutDir)/$(ProjectName).lib" SuppressStartupBanner="true" /> <Tool diff --git a/mak.vc9/cdsimple.vcproj b/mak.vc9/cdsimple.vcproj index 3d20eda..61f3a08 100644 --- a/mak.vc9/cdsimple.vcproj +++ b/mak.vc9/cdsimple.vcproj @@ -71,12 +71,12 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" AdditionalDependencies="freetype6.lib cd.lib iupcd.lib iup.lib comctl32.lib cdcontextplus.lib gdiplus.lib cdpdf.lib pdflib.lib iupcontrols.lib" - OutputFile="..\bin/cdsimple.exe" - LinkIncremental="2" + OutputFile="$(OutDir)\$(ProjectName).exe" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\lib,..\..\iup\lib" GenerateDebugInformation="true" - ProgramDatabaseFile="..\bin/cdsimple.pdb" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" SubSystem="1" RandomizedBaseAddress="1" DataExecutionPrevention="0" diff --git a/mak.vc9/cdsimplegdk.vcproj b/mak.vc9/cdsimplegdk.vcproj index 22e02cf..00765fc 100644 --- a/mak.vc9/cdsimplegdk.vcproj +++ b/mak.vc9/cdsimplegdk.vcproj @@ -71,12 +71,12 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" AdditionalDependencies="gtk-win32-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib pangowin32-1.0.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib freetype6.lib cd.lib iupcd.lib iupgtk.lib comctl32.lib cdcontextplus.lib gdiplus.lib cdpdf.lib pdflib.lib iupcontrols.lib" - OutputFile="..\bin/cdsimplegdk.exe" - LinkIncremental="2" + OutputFile="$(OutDir)\$(ProjectName).exe" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\lib,..\..\iup\lib;d:\lng\gtk\lib" GenerateDebugInformation="true" - ProgramDatabaseFile="..\bin/cdsimplegdk.pdb" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" SubSystem="1" RandomizedBaseAddress="1" DataExecutionPrevention="0" diff --git a/mak.vc9/cdtest.vcproj b/mak.vc9/cdtest.vcproj index b85a56e..6f0f4fc 100644 --- a/mak.vc9/cdtest.vcproj +++ b/mak.vc9/cdtest.vcproj @@ -75,12 +75,12 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" AdditionalDependencies="freetype6.lib comctl32.lib cd.lib iupcd.lib cdcontextplus.lib iup.lib gdiplus.lib cdpdf.lib pdflib.lib" - OutputFile="..\bin/cdtest.exe" - LinkIncremental="2" + OutputFile="$(OutDir)\$(ProjectName).exe" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\lib,..\..\iup\lib" GenerateDebugInformation="true" - ProgramDatabaseFile="..\bin/cdtest.pdb" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" SubSystem="1" /> <Tool diff --git a/mak.vc9/cdx11.vcproj b/mak.vc9/cdx11.vcproj index 57c57dc..5a9d16f 100644 --- a/mak.vc9/cdx11.vcproj +++ b/mak.vc9/cdx11.vcproj @@ -66,7 +66,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\cdx11.lib" + OutputFile="$(OutDir)/$(ProjectName).lib" SuppressStartupBanner="true" /> <Tool diff --git a/mak.vc9/cdxrender.vcproj b/mak.vc9/cdxrender.vcproj index 37f2377..c69927d 100644 --- a/mak.vc9/cdxrender.vcproj +++ b/mak.vc9/cdxrender.vcproj @@ -66,7 +66,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\cdxrender.lib" + OutputFile="$(OutDir)/$(ProjectName).lib" SuppressStartupBanner="true" /> <Tool |