Use a single marshal file for entire project

1 files changed, 7 insertions, 4 deletions

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