changeset 2056:a35d173cd99c

Merge
author Ritor1
date Sat, 30 Nov 2013 20:09:04 +0600
parents 95e9a5141338 (diff) 64e23bf9d27e (current diff)
children e249bd483311
files Build/Visual Studio 2012/World of Might and Magic.vcxproj Build/Visual Studio 2012/World of Might and Magic.vcxproj.filters LuaClass.h lib/swig/swigwin-2.0.11/UIControlModule_wrap.cxx
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/Build/Visual Studio 2012/World of Might and Magic.vcxproj	Fri Nov 29 12:20:44 2013 +0200
+++ b/Build/Visual Studio 2012/World of Might and Magic.vcxproj	Sat Nov 30 20:09:04 2013 +0600
@@ -388,6 +388,11 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename)_wrap.cxx</Outputs>
     </CustomBuild>
     <None Include="..\..\lib\swig.bat" />
+    <CustomBuild Include="..\..\PlayerModule.swig">
+      <FileType>Document</FileType>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call "lib/swig" "%(FileName)" %(RelativeDir) "%(FileName)%(Extension)" "%(FullPath)" "$(SolutionDir)" %(Filename)_wrap.cxx</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename)_wrap.cxx</Outputs>
+    </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
--- a/Build/Visual Studio 2012/World of Might and Magic.vcxproj.filters	Fri Nov 29 12:20:44 2013 +0200
+++ b/Build/Visual Studio 2012/World of Might and Magic.vcxproj.filters	Sat Nov 30 20:09:04 2013 +0600
@@ -608,5 +608,6 @@
     <CustomBuild Include="..\..\NewUI\Core\UIControlModule.swig">
       <Filter>NewUI\Core</Filter>
     </CustomBuild>
+    <CustomBuild Include="..\..\PlayerModule.swig" />
   </ItemGroup>
 </Project>
\ No newline at end of file