2008-03-11 Brent Fulgham <bfulgham@gmail.com>
authorpewtermoose@webkit.org <pewtermoose@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Mar 2008 21:28:22 +0000 (21:28 +0000)
committerpewtermoose@webkit.org <pewtermoose@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Mar 2008 21:28:22 +0000 (21:28 +0000)
WebKit/win:

        Reviewed by Adam Roben.

        Enabled WinLauncher as part of normal Windows build.
        http://bugs.webkit.org/show_bug.cgi?id=17715.

        * WebKit.vcproj/WebKit.sln:  Add WinLauncher to the set of things
          build during a Windows build.

WebKitTools:

        Reviewed by Adam Roben.

        Enabled WinLauncher as part of normal Windows build.
        http://bugs.webkit.org/show_bug.cgi?id=17715.

        * WinLauncher/WinLauncher.vcproj: Update to use vsprops so that
          it can find the proper libraries to link against.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@30967 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/win/ChangeLog
WebKit/win/WebKit.vcproj/WebKit.sln
WebKitTools/ChangeLog
WebKitTools/WinLauncher/WinLauncher.vcproj

index dbc4216..e243bf9 100644 (file)
@@ -1,3 +1,13 @@
+2008-03-11  Brent Fulgham  <bfulgham@gmail.com>
+
+        Reviewed by Adam Roben.
+
+        Enabled WinLauncher as part of normal Windows build.
+        http://bugs.webkit.org/show_bug.cgi?id=17715.
+
+        * WebKit.vcproj/WebKit.sln:  Add WinLauncher to the set of things
+          build during a Windows build.
+
 2008-03-11  Adam Roben  <aroben@apple.com>
 
         Roll out r30961 since it broke the default site icon on Windows
index 05c5f93..0058625 100644 (file)
@@ -141,6 +141,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QTMovieWin", "..\..\..\WebC
                {011D10F1-B656-4A1B-A0C3-3842F02122C5} = {011D10F1-B656-4A1B-A0C3-3842F02122C5}\r
        EndProjectSection\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinLauncher", "..\..\..\WebKitTools\WinLauncher\WinLauncher.vcproj", "{114FCA11-216B-4C8C-957E-30A75AE80443}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {B8437A41-67BC-4769-9452-45203827F821} = {B8437A41-67BC-4769-9452-45203827F821}\r
+               {0662A8A9-82A3-4638-97D8-EC425D8D87C9} = {0662A8A9-82A3-4638-97D8-EC425D8D87C9}\r
+       EndProjectSection\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug_Cairo|Win32 = Debug_Cairo|Win32\r
@@ -310,6 +316,16 @@ Global
                {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release_Cairo|Win32.Build.0 = Release|Win32\r
                {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release|Win32.ActiveCfg = Release|Win32\r
                {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release|Win32.Build.0 = Release|Win32\r
+               {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug_Cairo|Win32.ActiveCfg = Debug|Win32\r
+               {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug_Cairo|Win32.Build.0 = Debug|Win32\r
+               {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug_Internal|Win32.ActiveCfg = Debug|Win32\r
+               {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug_Internal|Win32.Build.0 = Debug|Win32\r
+               {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug|Win32.Build.0 = Debug|Win32\r
+               {114FCA11-216B-4C8C-957E-30A75AE80443}.Release_Cairo|Win32.ActiveCfg = Release|Win32\r
+               {114FCA11-216B-4C8C-957E-30A75AE80443}.Release_Cairo|Win32.Build.0 = Release|Win32\r
+               {114FCA11-216B-4C8C-957E-30A75AE80443}.Release|Win32.ActiveCfg = Release|Win32\r
+               {114FCA11-216B-4C8C-957E-30A75AE80443}.Release|Win32.Build.0 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
index a6fb7cc..5009235 100644 (file)
@@ -1,3 +1,13 @@
+2008-03-11  Brent Fulgham  <bfulgham@gmail.com>
+
+        Reviewed by Adam Roben.
+
+        Enabled WinLauncher as part of normal Windows build.
+        http://bugs.webkit.org/show_bug.cgi?id=17715.
+
+        * WinLauncher/WinLauncher.vcproj: Update to use vsprops so that
+          it can find the proper libraries to link against.
+
 2008-03-10  Julien Chaffraix  <julien.chaffraix@gmail.com>
 
         Reviewed and landed by Darin.
index 234df33..77363c5 100644 (file)
@@ -20,6 +20,7 @@
                        OutputDirectory="$(WebKitOutputDir)\bin"
                        IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"
                        ConfigurationType="1"
+                       InheritedPropertySheets="..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops"
                        CharacterSet="1"
                        >
                        <Tool