From 34cf164aa28c45c15ecf39b855f2de833a9b7c2d Mon Sep 17 00:00:00 2001
From: TingPing <tingping@tingping.se>
Date: Wed, 5 Feb 2014 20:42:48 -0500
Subject: Use a single marshal file for entire project

---
 src/common/common.vcxproj | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/common/common.vcxproj')

diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj
index 720faae7..17a8d829 100644
--- a/src/common/common.vcxproj
+++ b/src/common/common.vcxproj
@@ -24,6 +24,7 @@
     <ClInclude Include="ignore.h" />
     <ClInclude Include="inbound.h" />
     <ClInclude Include="inet.h" />
+    <ClInclude Include="marshal.h" />
     <ClInclude Include="modes.h" />
     <ClInclude Include="msproxy.h" />
     <ClInclude Include="network.h" />
@@ -56,6 +57,7 @@
     <ClCompile Include="identd.c" />
     <ClCompile Include="ignore.c" />
     <ClCompile Include="inbound.c" />
+    <ClCompile Include="marshal.c" />
     <ClCompile Include="modes.c" />
     <ClCompile Include="msproxy.c" />
     <ClCompile Include="network.c" />
@@ -156,15 +158,16 @@
   </ImportGroup>
   <ItemDefinitionGroup>
     <PreBuildEvent>
-      <Command>
-      <![CDATA[
+      <Command><![CDATA[
 SET SOLUTIONDIR=$(SolutionDir)..\
 powershell "$(SolutionDir)..\version-template.ps1" "$(SolutionDir)..\config-win32.h.tt" "$(SolutionDir)..\config-win32.h"
 powershell "$(SolutionDir)..\version-template.ps1" "$(SolutionDir)..\win32\version.txt.tt" "$(SolutionDir)..\win32\version.txt.tmp"
 REM version.txt must be in UTF-8 without trailing newline
 powershell "[string] $content = Get-Content '$(SolutionDir)..\win32\version.txt.tmp' -Encoding UTF8; [System.IO.File]::WriteAllText('$(SolutionDir)..\win32\version.txt', $content); Remove-Item '$(SolutionDir)..\win32\version.txt.tmp';"
-      ]]>
-      </Command>
+"$(DepsRoot)\bin\glib-genmarshal.exe" --prefix=_hexchat_marshal --header "$(ProjectDir)marshalers.list" > "$(ProjectDir)marshal.h"
+"$(DepsRoot)\bin\glib-genmarshal.exe" --prefix=_hexchat_marshal --body "$(ProjectDir)marshalers.list" > "$(ProjectDir)marshal.c"
+
+      ]]></Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
 </Project>
\ No newline at end of file
-- 
cgit 1.4.1