From 58ca1966c86650b38fa12ddfe07c2f6bd3f6b131 Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Sun, 3 Jun 2012 13:47:04 +0200 Subject: [PATCH] Solution fixes, debug config and x64 platform --- win32/common/common.vcxproj | 78 +++++++++++++++++++- win32/dirent-win32/dirent-win32.vcxproj | 74 ++++++++++++++++++- win32/fe-gtk/fe-gtk.vcxproj | 98 +++++++++++++++++++++++-- win32/pixmaps/pixmaps.vcxproj | 80 +++++++++++++++++++- win32/version/version.vcxproj | 79 +++++++++++++++++++- win32/xchat.props | 13 ++-- win32/xchat.sln | 22 ++++++ 7 files changed, 423 insertions(+), 21 deletions(-) diff --git a/win32/common/common.vcxproj b/win32/common/common.vcxproj index 17116886..a7e9eea9 100644 --- a/win32/common/common.vcxproj +++ b/win32/common/common.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + @@ -87,7 +95,13 @@ StaticLibrary true v110 - Unicode + MultiByte + + + StaticLibrary + true + v110 + MultiByte StaticLibrary @@ -96,6 +110,13 @@ true MultiByte + + StaticLibrary + false + v110 + true + MultiByte + @@ -103,10 +124,18 @@ + + + + + + + + @@ -115,7 +144,26 @@ Level3 Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;$(OwnFlags);%(PreprocessorDefinitions) + $(DepsRoot)\include;$(Glib);%(AdditionalIncludeDirectories) + true + CompileAsC + + + Windows + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;$(OwnFlags);%(PreprocessorDefinitions) + $(DepsRoot)\include;$(Glib);%(AdditionalIncludeDirectories) + true + CompileAsC Windows @@ -124,16 +172,38 @@ - Level3 + Level1 - MaxSpeed + MinSpace true true WIN32;NDEBUG;_LIB;$(OwnFlags);%(PreprocessorDefinitions) $(DepsRoot)\include;$(Glib);%(AdditionalIncludeDirectories) true CompileAsC + Size + + + Windows + true + true + true + + + + + Level1 + + + MinSpace + true + true + WIN32;NDEBUG;_LIB;$(OwnFlags);%(PreprocessorDefinitions) + $(DepsRoot)\include;$(Glib);%(AdditionalIncludeDirectories) + true + CompileAsC + Size Windows diff --git a/win32/dirent-win32/dirent-win32.vcxproj b/win32/dirent-win32/dirent-win32.vcxproj index c9223bef..8dfcf35e 100644 --- a/win32/dirent-win32/dirent-win32.vcxproj +++ b/win32/dirent-win32/dirent-win32.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + @@ -29,7 +37,13 @@ StaticLibrary true v110 - Unicode + MultiByte + + + StaticLibrary + true + v110 + MultiByte StaticLibrary @@ -38,6 +52,13 @@ true MultiByte + + StaticLibrary + false + v110 + true + MultiByte + @@ -45,10 +66,18 @@ + + + + + + + + @@ -58,6 +87,23 @@ Level3 Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + CompileAsC + + + Windows + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + CompileAsC Windows @@ -66,14 +112,36 @@ - Level3 + Level1 - MaxSpeed + MinSpace true true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) CompileAsC + true + Size + + + Windows + true + true + true + + + + + Level1 + + + MinSpace + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + CompileAsC + true + Size Windows diff --git a/win32/fe-gtk/fe-gtk.vcxproj b/win32/fe-gtk/fe-gtk.vcxproj index 0850e2fc..cf1bb5e2 100644 --- a/win32/fe-gtk/fe-gtk.vcxproj +++ b/win32/fe-gtk/fe-gtk.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + @@ -96,7 +104,13 @@ Application true v110 - Unicode + MultiByte + + + Application + true + v110 + MultiByte Application @@ -105,6 +119,13 @@ true MultiByte + + Application + false + v110 + true + MultiByte + @@ -112,40 +133,105 @@ + + + + + + + + true + + true + false + + false + - Use + NotUsing Level3 Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;$(OwnFlags);%(PreprocessorDefinitions) + $(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories) + true + CompileAsC Windows true + "$(DepsRoot)\lib";%(AdditionalLibraryDirectories) + $(DepLibs);"$(OutDir)\common.lib";"$(OutDir)\dirent-win32.lib";%(AdditionalDependencies) + mainCRTStartup + false + + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;$(OwnFlags);%(PreprocessorDefinitions) + $(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories) + true + CompileAsC + + + Windows + true + "$(DepsRoot)\lib";%(AdditionalLibraryDirectories) + $(DepLibs);"$(OutDir)\common.lib";"$(OutDir)\dirent-win32.lib";%(AdditionalDependencies) + mainCRTStartup + false - Level3 + Level1 NotUsing - MaxSpeed + MinSpace true true WIN32;NDEBUG;_WINDOWS;$(OwnFlags);%(PreprocessorDefinitions) - $(DepsRoot)\include;$(Glib);$(Gtk) + $(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories) true CompileAsC + Size + + + Windows + true + true + true + $(DepLibs);"$(OutDir)\common.lib";"$(OutDir)\dirent-win32.lib";%(AdditionalDependencies) + "$(DepsRoot)\lib";%(AdditionalLibraryDirectories) + mainCRTStartup + false + + + + + Level1 + NotUsing + MinSpace + true + true + WIN32;NDEBUG;_WINDOWS;$(OwnFlags);%(PreprocessorDefinitions) + $(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories) + true + CompileAsC + Size Windows diff --git a/win32/pixmaps/pixmaps.vcxproj b/win32/pixmaps/pixmaps.vcxproj index 78f86c1c..661d492d 100644 --- a/win32/pixmaps/pixmaps.vcxproj +++ b/win32/pixmaps/pixmaps.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + $(VCTargetsPath11) @@ -23,7 +31,13 @@ Application true v110 - Unicode + MultiByte + + + Application + true + v110 + MultiByte Application @@ -32,6 +46,13 @@ true MultiByte + + Application + false + v110 + true + MultiByte + @@ -39,17 +60,31 @@ + + + + + + + + true + + true + false + + false + @@ -62,6 +97,25 @@ Windows true + + "$(DepsRoot)\bin\gdk-pixbuf-csource" --build-list $(Pixmaps) > "$(SolutionDir)\..\src\pixmaps\inline_pngs.h" + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + + + Windows + true + + + "$(DepsRoot)\bin\gdk-pixbuf-csource" --build-list $(Pixmaps) > "$(SolutionDir)\..\src\pixmaps\inline_pngs.h" + @@ -87,6 +141,30 @@ "$(DepsRoot)\bin\gdk-pixbuf-csource" --build-list $(Pixmaps) > "$(SolutionDir)\..\src\pixmaps\inline_pngs.h" + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + + + Windows + true + true + true + + + + + + + "$(DepsRoot)\bin\gdk-pixbuf-csource" --build-list $(Pixmaps) > "$(SolutionDir)\..\src\pixmaps\inline_pngs.h" + + diff --git a/win32/version/version.vcxproj b/win32/version/version.vcxproj index 0498c72f..86f443be 100644 --- a/win32/version/version.vcxproj +++ b/win32/version/version.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + @@ -26,7 +34,13 @@ Application true v110 - Unicode + MultiByte + + + Application + true + v110 + MultiByte Application @@ -35,6 +49,13 @@ true MultiByte + + Application + false + v110 + true + MultiByte + @@ -42,17 +63,31 @@ + + + + + + + + true + + true + false + + false + @@ -60,6 +95,23 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + CompileAsC + + + Console + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + CompileAsC Console @@ -68,7 +120,7 @@ - Level3 + Level1 MaxSpeed @@ -76,6 +128,29 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) CompileAsC + true + + + Console + true + true + true + + + "$(OutputPath)\$(TargetName)$(TargetExt)" -r > "$(SolutionDir)\..\resource.h" + + + + + Level1 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + CompileAsC + true Console diff --git a/win32/xchat.props b/win32/xchat.props index b322a088..9e2607d3 100644 --- a/win32/xchat.props +++ b/win32/xchat.props @@ -2,12 +2,15 @@ + + c:\mozilla-build\deps root + _CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;G_DISABLE_CAST_CHECKS;G_DISABLE_DEPRECATED;GDK_PIXBUF_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;HAVE_STRTOULL;strtoull=_strtoui64;strcasecmp=stricmp;strncasecmp=strnicmp - c:\mozilla-build\deps-root\$(PlatformName) - $(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2 - $(DepsRoot)\include\gtk-2.0;$(DepsRoot)\lib\gtk-2.0\include;$(DepsRoot)\include\atk-1.0;$(DepsRoot)\include\cairo;$(DepsRoot)\include\pango-1.0;$(DepsRoot)\include\gdk-pixbuf-2.0 - bookpng "$(SolutionDir)\..\src\pixmaps\book.png" hoppng "$(SolutionDir)\..\src\pixmaps\hop.png" oppng "$(SolutionDir)\..\src\pixmaps\op.png" purplepng "$(SolutionDir)\..\src\pixmaps\purple.png" redpng "$(SolutionDir)\..\src\pixmaps\red.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" voicepng "$(SolutionDir)\..\src\pixmaps\voice.png" xchatpng "$(SolutionDir)\..\xchat.png" - gtk-win32-2.0.lib;gdk-win32-2.0.lib;atk-1.0.lib;gio-2.0.lib;gdk_pixbuf-2.0.lib;pangowin32-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;gobject-2.0.lib;gmodule-2.0.lib;glib-2.0.lib;intl.lib;libxml2.lib;libeay32.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib + $(YourDepsFolder)\$(PlatformName) + $(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2 + $(DepsRoot)\include\gtk-2.0;$(DepsRoot)\lib\gtk-2.0\include;$(DepsRoot)\include\atk-1.0;$(DepsRoot)\include\cairo;$(DepsRoot)\include\pango-1.0;$(DepsRoot)\include\gdk-pixbuf-2.0 + bookpng "$(SolutionDir)\..\src\pixmaps\book.png" hoppng "$(SolutionDir)\..\src\pixmaps\hop.png" oppng "$(SolutionDir)\..\src\pixmaps\op.png" purplepng "$(SolutionDir)\..\src\pixmaps\purple.png" redpng "$(SolutionDir)\..\src\pixmaps\red.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" voicepng "$(SolutionDir)\..\src\pixmaps\voice.png" xchatpng "$(SolutionDir)\..\xchat.png" + gtk-win32-2.0.lib;gdk-win32-2.0.lib;atk-1.0.lib;gio-2.0.lib;gdk_pixbuf-2.0.lib;pangowin32-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;gobject-2.0.lib;gmodule-2.0.lib;glib-2.0.lib;intl.lib;libxml2.lib;libeay32.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib diff --git a/win32/xchat.sln b/win32/xchat.sln index be2bc8f4..1c13a18e 100644 --- a/win32/xchat.sln +++ b/win32/xchat.sln @@ -20,29 +20,51 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {0F863741-E1CE-4625-84DC-7AD205A63B6B}.Debug|Win32.ActiveCfg = Debug|Win32 {0F863741-E1CE-4625-84DC-7AD205A63B6B}.Debug|Win32.Build.0 = Debug|Win32 + {0F863741-E1CE-4625-84DC-7AD205A63B6B}.Debug|x64.ActiveCfg = Debug|x64 + {0F863741-E1CE-4625-84DC-7AD205A63B6B}.Debug|x64.Build.0 = Debug|x64 {0F863741-E1CE-4625-84DC-7AD205A63B6B}.Release|Win32.ActiveCfg = Release|Win32 {0F863741-E1CE-4625-84DC-7AD205A63B6B}.Release|Win32.Build.0 = Release|Win32 + {0F863741-E1CE-4625-84DC-7AD205A63B6B}.Release|x64.ActiveCfg = Release|x64 + {0F863741-E1CE-4625-84DC-7AD205A63B6B}.Release|x64.Build.0 = Release|x64 {969AA8C5-1655-4CAC-A83F-F651959CAA2F}.Debug|Win32.ActiveCfg = Debug|Win32 {969AA8C5-1655-4CAC-A83F-F651959CAA2F}.Debug|Win32.Build.0 = Debug|Win32 + {969AA8C5-1655-4CAC-A83F-F651959CAA2F}.Debug|x64.ActiveCfg = Debug|x64 + {969AA8C5-1655-4CAC-A83F-F651959CAA2F}.Debug|x64.Build.0 = Debug|x64 {969AA8C5-1655-4CAC-A83F-F651959CAA2F}.Release|Win32.ActiveCfg = Release|Win32 {969AA8C5-1655-4CAC-A83F-F651959CAA2F}.Release|Win32.Build.0 = Release|Win32 + {969AA8C5-1655-4CAC-A83F-F651959CAA2F}.Release|x64.ActiveCfg = Release|x64 + {969AA8C5-1655-4CAC-A83F-F651959CAA2F}.Release|x64.Build.0 = Release|x64 {B724C127-7151-421A-8CA0-3FBA6D96D8CE}.Debug|Win32.ActiveCfg = Debug|Win32 {B724C127-7151-421A-8CA0-3FBA6D96D8CE}.Debug|Win32.Build.0 = Debug|Win32 + {B724C127-7151-421A-8CA0-3FBA6D96D8CE}.Debug|x64.ActiveCfg = Debug|x64 + {B724C127-7151-421A-8CA0-3FBA6D96D8CE}.Debug|x64.Build.0 = Debug|x64 {B724C127-7151-421A-8CA0-3FBA6D96D8CE}.Release|Win32.ActiveCfg = Release|Win32 {B724C127-7151-421A-8CA0-3FBA6D96D8CE}.Release|Win32.Build.0 = Release|Win32 + {B724C127-7151-421A-8CA0-3FBA6D96D8CE}.Release|x64.ActiveCfg = Release|x64 + {B724C127-7151-421A-8CA0-3FBA6D96D8CE}.Release|x64.Build.0 = Release|x64 {BBEA966D-9722-4CE3-B773-1AEC6E0234C3}.Debug|Win32.ActiveCfg = Debug|Win32 {BBEA966D-9722-4CE3-B773-1AEC6E0234C3}.Debug|Win32.Build.0 = Debug|Win32 + {BBEA966D-9722-4CE3-B773-1AEC6E0234C3}.Debug|x64.ActiveCfg = Debug|x64 + {BBEA966D-9722-4CE3-B773-1AEC6E0234C3}.Debug|x64.Build.0 = Debug|x64 {BBEA966D-9722-4CE3-B773-1AEC6E0234C3}.Release|Win32.ActiveCfg = Release|Win32 {BBEA966D-9722-4CE3-B773-1AEC6E0234C3}.Release|Win32.Build.0 = Release|Win32 + {BBEA966D-9722-4CE3-B773-1AEC6E0234C3}.Release|x64.ActiveCfg = Release|x64 + {BBEA966D-9722-4CE3-B773-1AEC6E0234C3}.Release|x64.Build.0 = Release|x64 {BFC7E652-7E90-441C-9BE5-F238B1912BFB}.Debug|Win32.ActiveCfg = Debug|Win32 {BFC7E652-7E90-441C-9BE5-F238B1912BFB}.Debug|Win32.Build.0 = Debug|Win32 + {BFC7E652-7E90-441C-9BE5-F238B1912BFB}.Debug|x64.ActiveCfg = Debug|x64 + {BFC7E652-7E90-441C-9BE5-F238B1912BFB}.Debug|x64.Build.0 = Debug|x64 {BFC7E652-7E90-441C-9BE5-F238B1912BFB}.Release|Win32.ActiveCfg = Release|Win32 {BFC7E652-7E90-441C-9BE5-F238B1912BFB}.Release|Win32.Build.0 = Release|Win32 + {BFC7E652-7E90-441C-9BE5-F238B1912BFB}.Release|x64.ActiveCfg = Release|x64 + {BFC7E652-7E90-441C-9BE5-F238B1912BFB}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE