win32: Update to build against gvsbuild

5 files changed, 4 insertions, 176 deletions

diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj
index 1d1fc570..33a883bf 100644
--- a/src/common/common.vcxproj
+++ b/src/common/common.vcxproj
@@ -111,11 +111,10 @@
     <PreBuildEvent>

       <Command><![CDATA[

 SET SOLUTIONDIR=$(SolutionDir)..\

-"$(HexChatLib)make-te.exe" < "$(ProjectDir)textevents.in" > "$(HexChatLib)textevents.h" 2> "$(HexChatLib)textenums.h"

+"$(Python3Path)\python.exe" $(ProjectDir)make-te.py "$(ProjectDir)textevents.in" "$(HexChatLib)textevents.h" "$(HexChatLib)textenums.h"

 powershell -File "$(SolutionDir)..\win32\version-template.ps1" "$(SolutionDir)..\win32\config.h.tt" "$(HexChatLib)config.h"

-"$(DepsRoot)\bin\glib-genmarshal.exe" --prefix=_hexchat_marshal --header "$(ProjectDir)marshalers.list" > "$(HexChatLib)marshal.h"

-"$(DepsRoot)\bin\glib-genmarshal.exe" --prefix=_hexchat_marshal --body "$(ProjectDir)marshalers.list" > "$(HexChatLib)marshal.c"

-

+"$(Python3Path)\python.exe" "$(DepsRoot)\bin\glib-genmarshal" --prefix=_hexchat_marshal --header "$(ProjectDir)marshalers.list" --output "$(HexChatLib)marshal.h"

+"$(Python3Path)\python.exe" "$(DepsRoot)\bin\glib-genmarshal" --prefix=_hexchat_marshal --body "$(ProjectDir)marshalers.list" --output "$(HexChatLib)marshal.c"

       ]]></Command>

     </PreBuildEvent>

   </ItemDefinitionGroup>

diff --git a/src/common/make-te.c b/src/common/make-te.c
deleted file mode 100644
index 834646ef..00000000
--- a/src/common/make-te.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/* HexChat
- * Copyright (C) 1998-2010 Peter Zelezny.
- * Copyright (C) 2009-2013 Berke Viktor.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-/* Process textevents.in with make-te < textevents.in > textevents.h 2> textenums.h
- *
- * textevents.in notes:
- *
- *  - The number in the ending lines indicates the total number of arguments
- *    a text event supports. So don't touch them unless you actually modify the
- *    EMIT_SIGNAL commands, too.
- *
- *  - The "n" prefix means the event text does not have to be translated thus
- *    the N_() gettext encapsulation will be omitted.
- *
- *  - EMIT_SIGNAL is just a macro for text_emit() which can take a total amount
- *    of 4 event arguments, so events have a hard limit of 4 arguments.
- *
- *  - $t means the xtext tab, i.e. the vertical separator line for indented nicks.
- *    That means $t forces a new line for that event.
- *
- *  - Text events are emitted in ctcp.c, dcc.c, hexchat.c, ignore.c, inbound.c,
- *    modes.c, notify.c, outbound.c, proto-irc.c, server.c and text.c.
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-int main(void)
-{
-	char name[512];
-	char num[512];
-	char help[512];
-	char def[512];
-	char args[512];
-	char buf[512];
-	char *defines[512];
-  	int i = 0, max;
-
-	printf("/* this file is auto generated, edit textevents.in instead! */\n\nconst struct text_event te[] = {\n");
-	while(fgets(name, sizeof(name), stdin))
-	{
-		name[strlen(name)-1] = 0;
-		fgets(num, sizeof(num), stdin);
-		num[strlen(num)-1] = 0;
-		fgets(help, sizeof(help), stdin);
-		help[strlen(help)-1] = 0;
-		fgets(def, sizeof(def), stdin);
-		def[strlen(def)-1] = 0;
-		fgets(args, sizeof(args), stdin);
-		args[strlen(args)-1] = 0;
-		fgets(buf, sizeof(buf), stdin);
-
-		if (args[0] == 'n')
-			printf("\n{\"%s\", %s, %d, \n\"%s\"},\n",
-							 name, help, atoi(args+1) | 128, def);
-		else
-			printf("\n{\"%s\", %s, %d, \nN_(\"%s\")},\n",
-							 name, help, atoi(args), def);
-		defines[i] = strdup (num);
-		i++;
-	}
-
-	printf("};\n");
-	
-	fprintf(stderr, "/* this file is auto generated, edit textevents.in instead! */\n\nenum\n{\n");
-	max = i;
-	i = 0;
-	while (i < max)
-	{
-		if (i + 1 < max)
-		{
-			fprintf(stderr, "\t%s,\t\t%s,\n", defines[i], defines[i+1]);
-			free (defines[i]);
-			i++;
-		} else
-			fprintf(stderr, "\t%s,\n", defines[i]);
-		free (defines[i]);
-		i++;
-	}
-	fprintf(stderr, "\tNUM_XP\n};\n");
-
-	return 0;
-}
diff --git a/src/common/make-te.vcxproj b/src/common/make-te.vcxproj
deleted file mode 100644
index b7bc2829..00000000
--- a/src/common/make-te.vcxproj
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup Label="Configuration">

-    <PlatformToolset>v140</PlatformToolset>

-    <ConfigurationType>Application</ConfigurationType>

-  </PropertyGroup>

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{A7D7CE59-2A31-48AE-BED2-A9828E241832}</ProjectGuid>

-    <Keyword>Win32Proj</Keyword>

-    <RootNamespace>makete</RootNamespace>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  <Import Project="..\..\win32\hexchat.props" />

-  <PropertyGroup>

-    <OutDir>$(HexChatLib)</OutDir>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <ClCompile>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <Link>

-      <SubSystem>Console</SubSystem>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="make-te.c" />

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-</Project>

diff --git a/src/common/make-te.vcxproj.filters b/src/common/make-te.vcxproj.filters
deleted file mode 100644
index ac9f0939..00000000
--- a/src/common/make-te.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <Filter Include="Source Files">

-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>

-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>

-    </Filter>

-    <Filter Include="Header Files">

-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>

-    </Filter>

-    <Filter Include="Resource Files">

-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="make-te.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-  </ItemGroup>

-</Project>
\ No newline at end of file
diff --git a/src/fe-gtk/fe-gtk.vcxproj b/src/fe-gtk/fe-gtk.vcxproj
index 5a668b5b..61d0a074 100644
--- a/src/fe-gtk/fe-gtk.vcxproj
+++ b/src/fe-gtk/fe-gtk.vcxproj
@@ -140,4 +140,4 @@ powershell "Get-Content -Encoding UTF8 '$(HexChatLib)hexchat.rc.utf8' | Out-File
     <Xml Include="..\..\data\hexchat.gresource.xml" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-</Project>
\ No newline at end of file
+</Project>