diff --git a/build/AgaLib.vcxproj b/build/AgaLib.vcxproj index 30a458a36..7ed602a3b 100644 --- a/build/AgaLib.vcxproj +++ b/build/AgaLib.vcxproj @@ -41,9 +41,9 @@ <_ProjectFileVersion>10.0.30319.1 ..\lib\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ ..\lib\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ $(ProjectName) $(ProjectName) @@ -216,6 +216,7 @@ + @@ -566,6 +567,7 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) diff --git a/build/AgaLib.vcxproj.filters b/build/AgaLib.vcxproj.filters index e7dd7b67e..958661ae8 100644 --- a/build/AgaLib.vcxproj.filters +++ b/build/AgaLib.vcxproj.filters @@ -526,6 +526,9 @@ Headers + + Headers + @@ -780,6 +783,9 @@ Sources + + Sources + diff --git a/build/Cb6.vcxproj b/build/Cb6.vcxproj index 97aebe8ea..16e37313a 100644 --- a/build/Cb6.vcxproj +++ b/build/Cb6.vcxproj @@ -40,14 +40,14 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ false true false false $(ProjectName) ..\exe\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ false false $(ProjectName) diff --git a/build/PATCHDEF.EXE b/build/PATCHDEF.EXE index a0d30711b..b4cf135fd 100644 Binary files a/build/PATCHDEF.EXE and b/build/PATCHDEF.EXE differ diff --git a/build/Uno.vcxproj b/build/Uno.vcxproj index a99d8dbad..05dfc3130 100644 --- a/build/Uno.vcxproj +++ b/build/Uno.vcxproj @@ -40,9 +40,9 @@ <_ProjectFileVersion>10.0.30319.1 ..\lib\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ ..\lib\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ $(ProjectName) $(ProjectName) diff --git a/build/agalib_alx.vcxproj b/build/agalib_alx.vcxproj index 611fe9b1e..e9099e982 100644 --- a/build/agalib_alx.vcxproj +++ b/build/agalib_alx.vcxproj @@ -48,11 +48,11 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ false false ..\exe\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ false false diff --git a/build/agalib_bagn.vcxproj b/build/agalib_bagn.vcxproj index cc9cb55d8..56f3d934f 100644 --- a/build/agalib_bagn.vcxproj +++ b/build/agalib_bagn.vcxproj @@ -43,11 +43,11 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ false false ..\exe\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ false false diff --git a/build/agalib_bagn.vcxproj.filters b/build/agalib_bagn.vcxproj.filters index a025edf29..7f6b0e818 100644 --- a/build/agalib_bagn.vcxproj.filters +++ b/build/agalib_bagn.vcxproj.filters @@ -74,14 +74,4 @@ Headers - - - Trr - - - - - Dir - - \ No newline at end of file diff --git a/build/agalib_rep.vcxproj b/build/agalib_rep.vcxproj index da726ba20..71d687c48 100644 --- a/build/agalib_rep.vcxproj +++ b/build/agalib_rep.vcxproj @@ -44,11 +44,11 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ false false ..\exe\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ false false diff --git a/build/ca.sln b/build/ca.sln index 739b3c757..9d58b18f6 100644 --- a/build/ca.sln +++ b/build/ca.sln @@ -51,6 +51,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cglib", "cglib.vcxproj", "{ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedocext", "vedocext.vcxproj", "{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lilib", "lilib.vcxproj", "{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -105,6 +107,10 @@ Global {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Debug|Win32.Build.0 = Debug|Win32 {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.ActiveCfg = Release|Win32 {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.Build.0 = Release|Win32 + {B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Debug|Win32.ActiveCfg = Debug|Win32 + {B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Debug|Win32.Build.0 = Debug|Win32 + {B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Release|Win32.ActiveCfg = Release|Win32 + {B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/cglib.vcxproj b/build/cglib.vcxproj index f7e206f32..2f78637ec 100644 --- a/build/cglib.vcxproj +++ b/build/cglib.vcxproj @@ -42,9 +42,9 @@ <_ProjectFileVersion>10.0.30319.1 ..\lib\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ ..\lib\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ $(ProjectName) $(ProjectName) AllRules.ruleset diff --git a/build/fastrip.exe b/build/fastrip.exe index 8bc86e627..0a766454c 100644 Binary files a/build/fastrip.exe and b/build/fastrip.exe differ diff --git a/build/fp0.vcxproj b/build/fp0.vcxproj index 43596688e..d516e6f23 100644 --- a/build/fp0.vcxproj +++ b/build/fp0.vcxproj @@ -92,6 +92,7 @@ MachineX86 + false true diff --git a/build/fp1.vcxproj b/build/fp1.vcxproj index 283be2e26..474c948c3 100644 --- a/build/fp1.vcxproj +++ b/build/fp1.vcxproj @@ -92,6 +92,7 @@ MachineX86 + false true diff --git a/build/gfm.vcxproj b/build/gfm.vcxproj index 2d281319e..6e312ddfa 100644 --- a/build/gfm.vcxproj +++ b/build/gfm.vcxproj @@ -42,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ true ..\exe\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ false $(ProjectName) false diff --git a/build/lilib.vcxproj b/build/lilib.vcxproj index 6658c27be..12dee11c6 100644 --- a/build/lilib.vcxproj +++ b/build/lilib.vcxproj @@ -42,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\lib\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ false ..\lib\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ false false false @@ -158,7 +158,6 @@ - diff --git a/build/pdflib_dll.vcxproj b/build/pdflib_dll.vcxproj index 4c656e159..e2e11d426 100644 --- a/build/pdflib_dll.vcxproj +++ b/build/pdflib_dll.vcxproj @@ -43,10 +43,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ true ..\exe\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ $(ProjectName) false false diff --git a/build/pdflibwrap.vcxproj b/build/pdflibwrap.vcxproj index b516580c1..84134f5da 100644 --- a/build/pdflibwrap.vcxproj +++ b/build/pdflibwrap.vcxproj @@ -40,9 +40,9 @@ <_ProjectFileVersion>10.0.30319.1 ..\lib\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ ..\lib\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ $(ProjectName) $(ProjectName) diff --git a/build/vedoc.vcxproj b/build/vedoc.vcxproj index 162e98e58..6121d748e 100644 --- a/build/vedoc.vcxproj +++ b/build/vedoc.vcxproj @@ -42,9 +42,9 @@ <_ProjectFileVersion>10.0.30319.1 ..\lib\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ ..\lib\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ $(ProjectName) $(ProjectName) AllRules.ruleset diff --git a/build/vedocext.vcxproj b/build/vedocext.vcxproj index d27d02848..dc229e2bb 100644 --- a/build/vedocext.vcxproj +++ b/build/vedocext.vcxproj @@ -43,9 +43,9 @@ <_ProjectFileVersion>10.0.30319.1 ..\lib\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ ..\lib\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ $(ProjectName) $(ProjectName) diff --git a/build/xi.vcxproj b/build/xi.vcxproj index 8a8667a8b..921fc47eb 100644 --- a/build/xi.vcxproj +++ b/build/xi.vcxproj @@ -42,10 +42,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ true ..\exe\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ false $(ProjectName) false diff --git a/build/xvaga.vcxproj b/build/xvaga.vcxproj index 5287f21c7..4acd78986 100644 --- a/build/xvaga.vcxproj +++ b/build/xvaga.vcxproj @@ -43,10 +43,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ false ..\exe\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ true $(ProjectName) false diff --git a/build/xvapp.vcxproj b/build/xvapp.vcxproj index 6ba9e33fe..9fbb6e666 100644 --- a/build/xvapp.vcxproj +++ b/build/xvapp.vcxproj @@ -42,9 +42,9 @@ <_ProjectFileVersion>10.0.30319.1 ..\lib\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ ..\lib\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ $(ProjectName) $(ProjectName) diff --git a/build/xvtdb.vcxproj b/build/xvtdb.vcxproj index a8fa3f6b8..9c133349a 100644 --- a/build/xvtdb.vcxproj +++ b/build/xvtdb.vcxproj @@ -44,10 +44,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ false ..\exe\ - ..\obj\$(SolutionName)\$(ProjectName)\ + ..\obj\common\$(ProjectName)\ true $(ProjectName) false