Author: AlbrechtS
Date: 2011-05-22 10:33:03 -0700 (Sun, 22 May 2011)
New Revision: 8716
Log:
ide/VisualC2008:
  Fixed unittests(d).exe name (was: unittest(d).exe).
  Added missing custom build rule to tree.fl in Release mode.
  Fixed fluid dependency (removed fltkdll), since this made fluid.exe build
  with fltkdll.dll (strange, the same config works in VisualC2010).


Modified:
   branches/branch-1.3/ide/VisualC2008/fltk.sln
   branches/branch-1.3/ide/VisualC2008/tree.vcproj
   branches/branch-1.3/ide/VisualC2008/unittests.vcproj

Modified: branches/branch-1.3/ide/VisualC2008/fltk.sln
===================================================================
--- branches/branch-1.3/ide/VisualC2008/fltk.sln        2011-05-22 13:23:39 UTC 
(rev 8715)
+++ branches/branch-1.3/ide/VisualC2008/fltk.sln        2011-05-22 17:33:03 UTC 
(rev 8716)
@@ -218,7 +218,6 @@
                {C17BAB42-F00B-4F71-9DF6-A921511C89EE} = 
{C17BAB42-F00B-4F71-9DF6-A921511C89EE}
                {08B82852-90B3-4767-A5D2-F0A4FCCB2377} = 
{08B82852-90B3-4767-A5D2-F0A4FCCB2377}
                {6E8E1663-B88D-4454-ADF2-279666A93306} = 
{6E8E1663-B88D-4454-ADF2-279666A93306}
-               {F0B8F4BD-955D-43CB-980C-805364D04A25} = 
{F0B8F4BD-955D-43CB-980C-805364D04A25}
                {E070AAFC-9D03-41A3-BC7D-30887EA0D50F} = 
{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}
        EndProjectSection
 EndProject

Modified: branches/branch-1.3/ide/VisualC2008/tree.vcproj
===================================================================
--- branches/branch-1.3/ide/VisualC2008/tree.vcproj     2011-05-22 13:23:39 UTC 
(rev 8715)
+++ branches/branch-1.3/ide/VisualC2008/tree.vcproj     2011-05-22 17:33:03 UTC 
(rev 8716)
@@ -446,6 +446,16 @@
                                        Outputs="../../test/$(InputName).cxx"
                                />
                        </FileConfiguration>
+                       <FileConfiguration
+                               Name="Release|Win32"
+                               >
+                               <Tool
+                                       Name="VCCustomBuildTool"
+                                       Description="Create $(InputName).cxx 
and $(InputName).h file with fluid"
+                                       CommandLine="cfluid $(InputName).fl"
+                                       Outputs="../../test/$(InputName).cxx"
+                               />
+                       </FileConfiguration>
                </File>
        </Files>
        <Globals>

Modified: branches/branch-1.3/ide/VisualC2008/unittests.vcproj
===================================================================
--- branches/branch-1.3/ide/VisualC2008/unittests.vcproj        2011-05-22 
13:23:39 UTC (rev 8715)
+++ branches/branch-1.3/ide/VisualC2008/unittests.vcproj        2011-05-22 
17:33:03 UTC (rev 8716)
@@ -2,7 +2,7 @@
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
-       Name="unittest"
+       Name="unittests"
        ProjectGUID="{58262A6E-4B0B-4308-93D7-06DC8166428B}"
        RootNamespace="unittest"
        TargetFrameworkVersion="131072"
@@ -74,7 +74,7 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="fltkd.lib comctl32.lib 
imm32.lib"
-                               OutputFile="../../test/unittestd.exe"
+                               OutputFile="../../test/unittestsd.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
                                AdditionalLibraryDirectories="..\..\lib"
@@ -168,7 +168,7 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="fltk.lib comctl32.lib 
imm32.lib"
-                               OutputFile="../../test/unittest.exe"
+                               OutputFile="../../test/unittests.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
                                AdditionalLibraryDirectories="..\..\lib"
@@ -260,7 +260,7 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="cairo.lib fltkd.lib 
comctl32.lib imm32.lib"
-                               OutputFile="../../test/unittestd.exe"
+                               OutputFile="../../test/unittestsd.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
                                AdditionalLibraryDirectories="..\..\lib"
@@ -354,7 +354,7 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="fltk.lib comctl32.lib 
imm32.lib cairo.lib"
-                               OutputFile="../../test/unittest.exe"
+                               OutputFile="../../test/unittests.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
                                AdditionalLibraryDirectories="..\..\lib"

_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit

Reply via email to