From eaa673182255fb261c91cab7c0ff16f7952b529a Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Sun, 10 Jun 2012 07:52:15 +0200 Subject: [PATCH] Migrate VS solution to VS2010+WDK7 --- src/common/common.vcxproj | 116 ++++++ {win32 => src}/common/common.vcxproj.filters | 119 +++--- src/common/util.c | 2 +- src/{dirent-win32 => dirent}/dirent-win32.c | 0 src/{dirent-win32 => dirent}/dirent-win32.h | 0 src/dirent/dirent.vcxproj | 60 +++ .../dirent/dirent.vcxproj.filters | 12 +- src/fe-gtk/fe-gtk.vcxproj | 132 +++++++ {win32 => src}/fe-gtk/fe-gtk.vcxproj.filters | 374 +++++++++--------- src/fe-text/fe-text.vcxproj | 64 +++ src/fe-text/fe-text.vcxproj.filters | 23 ++ src/pixmaps/pixmaps.vcxproj | 68 ++++ .../pixmaps/pixmaps.vcxproj.filters | 40 +- {win32 => src}/version/version.c | 1 - src/version/version.vcxproj | 59 +++ .../version/version.vcxproj.filters | 0 win32/common/common.vcxproj | 218 ---------- win32/dirent-win32/dirent-win32.vcxproj | 156 -------- win32/fe-gtk/fe-gtk.vcxproj | 250 ------------ win32/pixmaps/pixmaps.vcxproj | 183 --------- win32/version/version.vcxproj | 168 -------- win32/xchat.props | 2 +- win32/xchat.sln | 85 ++-- 23 files changed, 825 insertions(+), 1307 deletions(-) create mode 100644 src/common/common.vcxproj rename {win32 => src}/common/common.vcxproj.filters (53%) rename src/{dirent-win32 => dirent}/dirent-win32.c (100%) rename src/{dirent-win32 => dirent}/dirent-win32.h (100%) create mode 100644 src/dirent/dirent.vcxproj rename win32/dirent-win32/dirent-win32.vcxproj.filters => src/dirent/dirent.vcxproj.filters (81%) create mode 100644 src/fe-gtk/fe-gtk.vcxproj rename {win32 => src}/fe-gtk/fe-gtk.vcxproj.filters (54%) create mode 100644 src/fe-text/fe-text.vcxproj create mode 100644 src/fe-text/fe-text.vcxproj.filters create mode 100644 src/pixmaps/pixmaps.vcxproj rename {win32 => src}/pixmaps/pixmaps.vcxproj.filters (55%) rename {win32 => src}/version/version.c (99%) create mode 100644 src/version/version.vcxproj rename {win32 => src}/version/version.vcxproj.filters (100%) delete mode 100644 win32/common/common.vcxproj delete mode 100644 win32/dirent-win32/dirent-win32.vcxproj delete mode 100644 win32/fe-gtk/fe-gtk.vcxproj delete mode 100644 win32/pixmaps/pixmaps.vcxproj delete mode 100644 win32/version/version.vcxproj diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj new file mode 100644 index 00000000..f0a730b7 --- /dev/null +++ b/src/common/common.vcxproj @@ -0,0 +1,116 @@ + + + + + Release + Win32 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {87554B59-006C-4D94-9714-897B27067BA3} + Win32Proj + common + + + + StaticLibrary + false + true + MultiByte + WDK7 + + + + + + + + + + + + + Level1 + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;$(OwnFlags);%(PreprocessorDefinitions) + $(DepsRoot)\include;$(Glib);%(AdditionalIncludeDirectories) + true + + + Windows + true + true + true + + + + + + \ No newline at end of file diff --git a/win32/common/common.vcxproj.filters b/src/common/common.vcxproj.filters similarity index 53% rename from win32/common/common.vcxproj.filters rename to src/common/common.vcxproj.filters index b4079efe..afb66e63 100644 --- a/win32/common/common.vcxproj.filters +++ b/src/common/common.vcxproj.filters @@ -11,100 +11,100 @@ - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files @@ -112,85 +112,82 @@ - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - - Source Files - - + Source Files diff --git a/src/common/util.c b/src/common/util.c index a79e343b..73e1b29a 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -32,7 +32,7 @@ #include #include #include -#include "../dirent-win32/dirent-win32.h" +#include "../dirent/dirent-win32.h" #else #include #include diff --git a/src/dirent-win32/dirent-win32.c b/src/dirent/dirent-win32.c similarity index 100% rename from src/dirent-win32/dirent-win32.c rename to src/dirent/dirent-win32.c diff --git a/src/dirent-win32/dirent-win32.h b/src/dirent/dirent-win32.h similarity index 100% rename from src/dirent-win32/dirent-win32.h rename to src/dirent/dirent-win32.h diff --git a/src/dirent/dirent.vcxproj b/src/dirent/dirent.vcxproj new file mode 100644 index 00000000..65fa2fb0 --- /dev/null +++ b/src/dirent/dirent.vcxproj @@ -0,0 +1,60 @@ + + + + + Release + Win32 + + + + + + + + + + {98B56DF9-E4F1-4696-A565-5F7823CF214D} + Win32Proj + dirent + + + + StaticLibrary + false + true + MultiByte + WDK7 + + + + + + + + + + + $(ProjectName)-win32 + + + + Level1 + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + + + + + + \ No newline at end of file diff --git a/win32/dirent-win32/dirent-win32.vcxproj.filters b/src/dirent/dirent.vcxproj.filters similarity index 81% rename from win32/dirent-win32/dirent-win32.vcxproj.filters rename to src/dirent/dirent.vcxproj.filters index d4d7e628..d889015d 100644 --- a/win32/dirent-win32/dirent-win32.vcxproj.filters +++ b/src/dirent/dirent.vcxproj.filters @@ -11,13 +11,13 @@ - - Source Files - - - - + Header Files + + + Source Files + + \ No newline at end of file diff --git a/src/fe-gtk/fe-gtk.vcxproj b/src/fe-gtk/fe-gtk.vcxproj new file mode 100644 index 00000000..deb76c27 --- /dev/null +++ b/src/fe-gtk/fe-gtk.vcxproj @@ -0,0 +1,132 @@ + + + + + Release + Win32 + + + + {E4BDB4C8-2335-415A-ACEE-BA88B19BFE82} + Win32Proj + fegtk + + + + Application + false + true + MultiByte + WDK7 + + + + + + + + + + + false + xchat + + + + Level1 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;$(OwnFlags);%(PreprocessorDefinitions) + $(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories) + true + + + Windows + true + true + true + $(DepsRoot)\lib;%(AdditionalLibraryDirectories) + $(DepLibs);"$(OutDir)\common.lib";"$(OutDir)\dirent-win32.lib";%(AdditionalDependencies) + mainCRTStartup + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/win32/fe-gtk/fe-gtk.vcxproj.filters b/src/fe-gtk/fe-gtk.vcxproj.filters similarity index 54% rename from win32/fe-gtk/fe-gtk.vcxproj.filters rename to src/fe-gtk/fe-gtk.vcxproj.filters index a99aa4de..0e2e830b 100644 --- a/win32/fe-gtk/fe-gtk.vcxproj.filters +++ b/src/fe-gtk/fe-gtk.vcxproj.filters @@ -15,202 +15,202 @@ - - Resource Files - + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + - + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + Resource Files - + Resource Files - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - + + Resource Files + \ No newline at end of file diff --git a/src/fe-text/fe-text.vcxproj b/src/fe-text/fe-text.vcxproj new file mode 100644 index 00000000..389c7b5e --- /dev/null +++ b/src/fe-text/fe-text.vcxproj @@ -0,0 +1,64 @@ + + + + + Release + Win32 + + + + {E93E1255-95D1-4B08-8FDF-B53CC6A21280} + Win32Proj + fetext + + + + Application + false + true + MultiByte + WDK7 + + + + + + + + + + + false + xchat-text + + + + Level1 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;$(OwnFlags);%(PreprocessorDefinitions) + $(DepsRoot)\include;$(Glib);%(AdditionalIncludeDirectories) + true + + + Console + true + true + true + $(DepLibs);"$(OutDir)\common.lib";"$(OutDir)\dirent-win32.lib";%(AdditionalDependencies) + $(DepsRoot)\lib;%(AdditionalLibraryDirectories) + + + + + + + + + + + + \ No newline at end of file diff --git a/src/fe-text/fe-text.vcxproj.filters b/src/fe-text/fe-text.vcxproj.filters new file mode 100644 index 00000000..e8a4bcc5 --- /dev/null +++ b/src/fe-text/fe-text.vcxproj.filters @@ -0,0 +1,23 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Header Files + + + + + Source Files + + + \ No newline at end of file diff --git a/src/pixmaps/pixmaps.vcxproj b/src/pixmaps/pixmaps.vcxproj new file mode 100644 index 00000000..39151d5a --- /dev/null +++ b/src/pixmaps/pixmaps.vcxproj @@ -0,0 +1,68 @@ + + + + + Release + Win32 + + + + {626DA61C-FA8B-474C-B2F5-72AD9DFEE642} + Win32Proj + pixmaps + + + + Application + false + true + MultiByte + WDK7 + + + + + + + + + + + false + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + + + "$(DepsRoot)\bin\gdk-pixbuf-csource" --build-list $(Pixmaps) > "$(SolutionDir)\..\src\pixmaps\inline_pngs.h" + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/win32/pixmaps/pixmaps.vcxproj.filters b/src/pixmaps/pixmaps.vcxproj.filters similarity index 55% rename from win32/pixmaps/pixmaps.vcxproj.filters rename to src/pixmaps/pixmaps.vcxproj.filters index 624f1ab6..aca4cd4b 100644 --- a/win32/pixmaps/pixmaps.vcxproj.filters +++ b/src/pixmaps/pixmaps.vcxproj.filters @@ -7,35 +7,35 @@ - + Resource Files - - + + Resource Files - - + + Resource Files - - + + Resource Files - - + + Resource Files - - + + Resource Files - - + + Resource Files - - + + Resource Files - - + + Resource Files - - + + Resource Files - + \ No newline at end of file diff --git a/win32/version/version.c b/src/version/version.c similarity index 99% rename from win32/version/version.c rename to src/version/version.c index d9e1ef9f..14312a43 100644 --- a/win32/version/version.c +++ b/src/version/version.c @@ -26,7 +26,6 @@ #include #include -#include #include #include "../../config.h" diff --git a/src/version/version.vcxproj b/src/version/version.vcxproj new file mode 100644 index 00000000..e6d510f8 --- /dev/null +++ b/src/version/version.vcxproj @@ -0,0 +1,59 @@ + + + + + Release + Win32 + + + + {6CD3647E-4541-4849-9DD7-C8816665AE42} + Win32Proj + version + + + + Application + false + true + MultiByte + WDK7 + + + + + + + + + + + false + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + + + "$(OutputPath)\$(TargetName)$(TargetExt)" -r > "$(SolutionDir)\..\resource.h" + + + + + + + + + \ No newline at end of file diff --git a/win32/version/version.vcxproj.filters b/src/version/version.vcxproj.filters similarity index 100% rename from win32/version/version.vcxproj.filters rename to src/version/version.vcxproj.filters diff --git a/win32/common/common.vcxproj b/win32/common/common.vcxproj deleted file mode 100644 index a7e9eea9..00000000 --- a/win32/common/common.vcxproj +++ /dev/null @@ -1,218 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(VCTargetsPath11) - - - {0F863741-E1CE-4625-84DC-7AD205A63B6B} - Win32Proj - common - - - - StaticLibrary - true - v110 - MultiByte - - - StaticLibrary - true - v110 - MultiByte - - - StaticLibrary - false - v110 - true - MultiByte - - - StaticLibrary - false - v110 - true - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - Level3 - Disabled - 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 - true - - - - - Level1 - - - 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 - true - true - true - - - - - - \ No newline at end of file diff --git a/win32/dirent-win32/dirent-win32.vcxproj b/win32/dirent-win32/dirent-win32.vcxproj deleted file mode 100644 index 8dfcf35e..00000000 --- a/win32/dirent-win32/dirent-win32.vcxproj +++ /dev/null @@ -1,156 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - - - - - - - $(VCTargetsPath11) - - - {969AA8C5-1655-4CAC-A83F-F651959CAA2F} - Win32Proj - direntwin32 - - - - StaticLibrary - true - v110 - MultiByte - - - StaticLibrary - true - v110 - MultiByte - - - StaticLibrary - false - v110 - true - MultiByte - - - StaticLibrary - false - v110 - true - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - CompileAsC - - - Windows - true - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - CompileAsC - - - Windows - true - - - - - Level1 - - - 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 - true - true - true - - - - - - \ No newline at end of file diff --git a/win32/fe-gtk/fe-gtk.vcxproj b/win32/fe-gtk/fe-gtk.vcxproj deleted file mode 100644 index cf1bb5e2..00000000 --- a/win32/fe-gtk/fe-gtk.vcxproj +++ /dev/null @@ -1,250 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(VCTargetsPath11) - - - {BFC7E652-7E90-441C-9BE5-F238B1912BFB} - Win32Proj - fegtk - - - - Application - true - v110 - MultiByte - - - Application - true - v110 - MultiByte - - - Application - false - v110 - true - MultiByte - - - Application - false - v110 - true - MultiByte - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - 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 - - - - - 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 - - - - - Level1 - NotUsing - MinSpace - true - true - WIN32;NDEBUG;_WINDOWS;$(OwnFlags);%(PreprocessorDefinitions) - $(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 - true - true - true - $(DepLibs);"$(OutDir)\common.lib";"$(OutDir)\dirent-win32.lib";%(AdditionalDependencies) - "$(DepsRoot)\lib";%(AdditionalLibraryDirectories) - mainCRTStartup - false - - - - - - \ No newline at end of file diff --git a/win32/pixmaps/pixmaps.vcxproj b/win32/pixmaps/pixmaps.vcxproj deleted file mode 100644 index 661d492d..00000000 --- a/win32/pixmaps/pixmaps.vcxproj +++ /dev/null @@ -1,183 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - $(VCTargetsPath11) - - - {BBEA966D-9722-4CE3-B773-1AEC6E0234C3} - Win32Proj - pixmaps - - - - Application - true - v110 - MultiByte - - - Application - true - v110 - MultiByte - - - Application - false - v110 - true - MultiByte - - - Application - false - v110 - true - MultiByte - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - - - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - - - 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" - - - - - 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" - - - - - 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" - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/win32/version/version.vcxproj b/win32/version/version.vcxproj deleted file mode 100644 index 86f443be..00000000 --- a/win32/version/version.vcxproj +++ /dev/null @@ -1,168 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - - - - $(VCTargetsPath11) - - - {B724C127-7151-421A-8CA0-3FBA6D96D8CE} - Win32Proj - version - - - - Application - true - v110 - MultiByte - - - Application - true - v110 - MultiByte - - - Application - false - v110 - true - MultiByte - - - Application - false - v110 - true - MultiByte - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - CompileAsC - - - Console - true - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - CompileAsC - - - Console - true - - - - - Level1 - - - MaxSpeed - true - 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 - true - true - true - - - "$(OutputPath)\$(TargetName)$(TargetExt)" -r > "$(SolutionDir)\..\resource.h" - - - - - - \ No newline at end of file diff --git a/win32/xchat.props b/win32/xchat.props index 9e2607d3..09f26df0 100644 --- a/win32/xchat.props +++ b/win32/xchat.props @@ -5,7 +5,7 @@ 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 + _CRT_SECURE_NO_WARNINGS;G_DISABLE_CAST_CHECKS;G_DISABLE_DEPRECATED;GDK_PIXBUF_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;HAVE_STRTOULL;strtoull=_strtoui64;strcasecmp=stricmp;strncasecmp=strnicmp $(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 diff --git a/win32/xchat.sln b/win32/xchat.sln index 1c13a18e..430e3d60 100644 --- a/win32/xchat.sln +++ b/win32/xchat.sln @@ -1,70 +1,45 @@  -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dirent-win32", "dirent-win32\dirent-win32.vcxproj", "{969AA8C5-1655-4CAC-A83F-F651959CAA2F}" +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "..\src\common\common.vcxproj", "{87554B59-006C-4D94-9714-897B27067BA3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common\common.vcxproj", "{0F863741-E1CE-4625-84DC-7AD205A63B6B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dirent", "..\src\dirent\dirent.vcxproj", "{98B56DF9-E4F1-4696-A565-5F7823CF214D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fe-gtk", "fe-gtk\fe-gtk.vcxproj", "{BFC7E652-7E90-441C-9BE5-F238B1912BFB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pixmaps", "..\src\pixmaps\pixmaps.vcxproj", "{626DA61C-FA8B-474C-B2F5-72AD9DFEE642}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "version", "..\src\version\version.vcxproj", "{6CD3647E-4541-4849-9DD7-C8816665AE42}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fe-gtk", "..\src\fe-gtk\fe-gtk.vcxproj", "{E4BDB4C8-2335-415A-ACEE-BA88B19BFE82}" ProjectSection(ProjectDependencies) = postProject - {0F863741-E1CE-4625-84DC-7AD205A63B6B} = {0F863741-E1CE-4625-84DC-7AD205A63B6B} - {969AA8C5-1655-4CAC-A83F-F651959CAA2F} = {969AA8C5-1655-4CAC-A83F-F651959CAA2F} - {B724C127-7151-421A-8CA0-3FBA6D96D8CE} = {B724C127-7151-421A-8CA0-3FBA6D96D8CE} - {BBEA966D-9722-4CE3-B773-1AEC6E0234C3} = {BBEA966D-9722-4CE3-B773-1AEC6E0234C3} + {626DA61C-FA8B-474C-B2F5-72AD9DFEE642} = {626DA61C-FA8B-474C-B2F5-72AD9DFEE642} + {87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3} + {6CD3647E-4541-4849-9DD7-C8816665AE42} = {6CD3647E-4541-4849-9DD7-C8816665AE42} + {98B56DF9-E4F1-4696-A565-5F7823CF214D} = {98B56DF9-E4F1-4696-A565-5F7823CF214D} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pixmaps", "pixmaps\pixmaps.vcxproj", "{BBEA966D-9722-4CE3-B773-1AEC6E0234C3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "version", "version\version.vcxproj", "{B724C127-7151-421A-8CA0-3FBA6D96D8CE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fe-text", "..\src\fe-text\fe-text.vcxproj", "{E93E1255-95D1-4B08-8FDF-B53CC6A21280}" + ProjectSection(ProjectDependencies) = postProject + {87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3} + {98B56DF9-E4F1-4696-A565-5F7823CF214D} = {98B56DF9-E4F1-4696-A565-5F7823CF214D} + EndProjectSection 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 + {87554B59-006C-4D94-9714-897B27067BA3}.Release|Win32.ActiveCfg = Release|Win32 + {87554B59-006C-4D94-9714-897B27067BA3}.Release|Win32.Build.0 = Release|Win32 + {98B56DF9-E4F1-4696-A565-5F7823CF214D}.Release|Win32.ActiveCfg = Release|Win32 + {98B56DF9-E4F1-4696-A565-5F7823CF214D}.Release|Win32.Build.0 = Release|Win32 + {626DA61C-FA8B-474C-B2F5-72AD9DFEE642}.Release|Win32.ActiveCfg = Release|Win32 + {626DA61C-FA8B-474C-B2F5-72AD9DFEE642}.Release|Win32.Build.0 = Release|Win32 + {6CD3647E-4541-4849-9DD7-C8816665AE42}.Release|Win32.ActiveCfg = Release|Win32 + {6CD3647E-4541-4849-9DD7-C8816665AE42}.Release|Win32.Build.0 = Release|Win32 + {E4BDB4C8-2335-415A-ACEE-BA88B19BFE82}.Release|Win32.ActiveCfg = Release|Win32 + {E4BDB4C8-2335-415A-ACEE-BA88B19BFE82}.Release|Win32.Build.0 = Release|Win32 + {E93E1255-95D1-4B08-8FDF-B53CC6A21280}.Release|Win32.ActiveCfg = Release|Win32 + {E93E1255-95D1-4B08-8FDF-B53CC6A21280}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE