From eaa673182255fb261c91cab7c0ff16f7952b529a Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Sun, 10 Jun 2012 07:52:15 +0200 Subject: Migrate VS solution to VS2010+WDK7 --- win32/common/common.vcxproj | 218 --------------------- win32/common/common.vcxproj.filters | 197 ------------------- win32/dirent-win32/dirent-win32.vcxproj | 156 --------------- win32/dirent-win32/dirent-win32.vcxproj.filters | 23 --- win32/fe-gtk/fe-gtk.vcxproj | 250 ------------------------ win32/fe-gtk/fe-gtk.vcxproj.filters | 216 -------------------- win32/pixmaps/pixmaps.vcxproj | 183 ----------------- win32/pixmaps/pixmaps.vcxproj.filters | 41 ---- win32/version/version.c | 144 -------------- win32/version/version.vcxproj | 168 ---------------- win32/version/version.vcxproj.filters | 14 -- win32/xchat.props | 2 +- win32/xchat.sln | 85 +++----- 13 files changed, 31 insertions(+), 1666 deletions(-) delete mode 100644 win32/common/common.vcxproj delete mode 100644 win32/common/common.vcxproj.filters delete mode 100644 win32/dirent-win32/dirent-win32.vcxproj delete mode 100644 win32/dirent-win32/dirent-win32.vcxproj.filters delete mode 100644 win32/fe-gtk/fe-gtk.vcxproj delete mode 100644 win32/fe-gtk/fe-gtk.vcxproj.filters delete mode 100644 win32/pixmaps/pixmaps.vcxproj delete mode 100644 win32/pixmaps/pixmaps.vcxproj.filters delete mode 100644 win32/version/version.c delete mode 100644 win32/version/version.vcxproj delete mode 100644 win32/version/version.vcxproj.filters (limited to 'win32') 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/common/common.vcxproj.filters b/win32/common/common.vcxproj.filters deleted file mode 100644 index b4079efe..00000000 --- a/win32/common/common.vcxproj.filters +++ /dev/null @@ -1,197 +0,0 @@ - - - - - {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 - - - 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 - - - - - 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 - - - \ 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/dirent-win32/dirent-win32.vcxproj.filters b/win32/dirent-win32/dirent-win32.vcxproj.filters deleted file mode 100644 index d4d7e628..00000000 --- a/win32/dirent-win32/dirent-win32.vcxproj.filters +++ /dev/null @@ -1,23 +0,0 @@ - - - - - {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 - - - - - Source Files - - - - - Header Files - - - \ 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/fe-gtk/fe-gtk.vcxproj.filters b/win32/fe-gtk/fe-gtk.vcxproj.filters deleted file mode 100644 index a99aa4de..00000000 --- a/win32/fe-gtk/fe-gtk.vcxproj.filters +++ /dev/null @@ -1,216 +0,0 @@ - - - - - {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 - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Resource 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 - - - \ 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/pixmaps/pixmaps.vcxproj.filters b/win32/pixmaps/pixmaps.vcxproj.filters deleted file mode 100644 index 624f1ab6..00000000 --- a/win32/pixmaps/pixmaps.vcxproj.filters +++ /dev/null @@ -1,41 +0,0 @@ - - - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - 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/win32/version/version.c deleted file mode 100644 index d9e1ef9f..00000000 --- a/win32/version/version.c +++ /dev/null @@ -1,144 +0,0 @@ -/* XChat-WDK - * Copyright (c) 2011 Berke Viktor. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include -#include -#include -#include "../../config.h" - -char * -comma () -{ - int major, minor; - char *version_string; /* nnnn,n,n,n format */ - - version_string = (char*) malloc (11); - - if (sscanf (PACKAGE_VERSION, "%d-%d", &major, &minor) > 1) - { - sprintf (version_string, "%d,%d,0,0", major, minor); - } else - { - sprintf (version_string, "%d,0,0,0", major); - } - - return version_string; -} - -char * -point () -{ - int major1, major2, major3, major4, minor; - char *version_string; /* nn.nn.nn.nn format */ - - version_string = (char*) malloc (12); - - if (sscanf (PACKAGE_VERSION, "%c%c%c%c-%d", &major1, &major2, &major3, &major4, &minor) > 4) - { - sprintf (version_string, "%c%c.%c%c.%d.0", major1, major2, major3, major4, minor); - } else - { - sprintf (version_string, "%c%c.%c%c.0.0", major1, major2, major3, major4); - } - - return version_string; -} - -int -main (int argc, char *argv[]) -{ - if (argc > 1) - { - if (!strcmp (argv[1], "-r")) /* xchat.rc/FILEVERSION, PRODUCTVERSION */ - { - printf ("#define COMMA_VERSION %s\n", comma ()); - } - else if (!strcmp (argv[1], "-a32")) /* xchat-wdk.iss/AppVerName */ - { - printf ("AppVerName=XChat-WDK %s (x86)\n", PACKAGE_VERSION); - } - else if (!strcmp (argv[1], "-a64")) /* xchat-wdk.iss/AppVerName */ - { - printf ("AppVerName=XChat-WDK %s (x64)\n", PACKAGE_VERSION); - } - else if (!strcmp (argv[1], "-v")) /* xchat-wdk.iss/AppVersion */ - { - printf ("AppVersion=%s\n", point ()); - } - else if (!strcmp (argv[1], "-i")) /* xchat-wdk.iss/VersionInfoVersion */ - { - printf ("VersionInfoVersion=%s\n", point ()); - } - else if (!strcmp (argv[1], "-o32")) /* xchat-wdk.iss/OutputBaseFilename */ - { - printf ("OutputBaseFilename=XChat-WDK %s x86\n", PACKAGE_VERSION); - } - else if (!strcmp (argv[1], "-o64")) /* xchat-wdk.iss/OutputBaseFilename */ - { - printf ("OutputBaseFilename=XChat-WDK %s x64\n", PACKAGE_VERSION); - } - else if (!strcmp (argv[1], "-v")) /* version.txt */ - { - printf ("%s", PACKAGE_VERSION); - } else - { - printf ("usage:\n\t-a\txchat-wdk.iss/AppVerName\n\t-i\txchat-wdk.iss/VersionInfoVersion\n\t-o\txchat-wdk.iss/OutputBaseFilename\n\t-r\txchat.rc/FILEVERSION, PRODUCTVERSION\n\t-v\txchat-wdk.iss/AppVersion\n"); - } - } else - { - printf ("usage:\n\t-a\txchat-wdk.iss/AppVerName\n\t-i\txchat-wdk.iss/VersionInfoVersion\n\t-o\txchat-wdk.iss/OutputBaseFilename\n\t-r\txchat.rc/FILEVERSION, PRODUCTVERSION\n\t-v\txchat-wdk.iss/AppVersion\n"); - } - -#if 0 /* ugly hack */ - switch ((int) argv[1][0]) - { - case 'r': /* xchat.rc/FILEVERSION, PRODUCTVERSION*/ - printf ("#define COMMA_VERSION \"%s\"\n", comma ()); - break; - case 'a': /* xchat-wdk.iss/AppVerName */ - printf ("AppVerName=XChat-WDK %s\n", PACKAGE_VERSION); - break; - case 'v': /* xchat-wdk.iss/AppVersion */ - printf ("AppVersion=%s\n", point ()); - break; - case 'i': /* xchat-wdk.iss/VersionInfoVersion */ - printf ("VersionInfoVersion=%s\n", point ()); - break; - case 'o': /* xchat-wdk.iss/OutputBaseFilename */ - printf ("OutputBaseFilename=XChat-WDK %s\n", PACKAGE_VERSION); - break; - case 'u': /* version.txt */ - printf ("%s", PACKAGE_VERSION); - break; - default: - printf ("use a, i, o, r or v.\n"); - break; - } -#endif - - return 0; -} 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/version/version.vcxproj.filters b/win32/version/version.vcxproj.filters deleted file mode 100644 index decec7d0..00000000 --- a/win32/version/version.vcxproj.filters +++ /dev/null @@ -1,14 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - \ 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 -- cgit 1.4.1