Mercurial > mm7

changeset 2041:ea8e801fdeab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
swig.bat
author Ritor1
date Mon, 25 Nov 2013 16:44:53 +0600
parents d4cc4d71d9cf
children 5bed2eba1611
files Build/Visual Studio 2010/World of Might and Magic.vcxproj Build/Visual Studio 2010/World of Might and Magic.vcxproj.filters lib/swig.bat lib/swig/swigwin-2.0.11/UIControlModule.swig
diffstat 4 files changed, 441 insertions(+), 157 deletions(-) [+]
line wrap: on
line diff
--- a/Build/Visual Studio 2010/World of Might and Magic.vcxproj	Fri Nov 22 23:28:02 2013 +0600
+++ b/Build/Visual Studio 2010/World of Might and Magic.vcxproj	Mon Nov 25 16:44:53 2013 +0600
@@ -44,6 +44,7 @@
     <IntDir>$(Configuration)\</IntDir>
     <OutDir>$(WoMM_MM7_INSTALL_DIR)\</OutDir>
     <GenerateManifest>false</GenerateManifest>
+    <IncludePath>$(SolutionDir)../../;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
@@ -63,6 +64,9 @@
       <AdditionalDependencies>..\..\lib\legacy_dx\lib\ddraw.lib;..\..\lib\legacy_dx\lib\dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
     </Link>
+    <PostBuildEvent>
+      <Command>XCOPY "$(SolutionDir)../../Scripts" "$(OutDir)data/scripts/lua/core" /E /I /F /R /Y</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -142,8 +146,6 @@
     <ClCompile Include="..\..\lib\lua\lua-5.2.2\lundump.c" />
     <ClCompile Include="..\..\lib\lua\lua-5.2.2\lvm.c" />
     <ClCompile Include="..\..\lib\lua\lua-5.2.2\lzio.c" />
-    <ClCompile Include="..\..\lib\swig\swigwin-2.0.11\TestModule_wrap.cxx" />
-    <ClCompile Include="..\..\lib\swig\swigwin-2.0.11\UIControlModule_wrap.cxx" />
     <ClCompile Include="..\..\lib\zlib\adler32.c" />
     <ClCompile Include="..\..\lib\zlib\compress.c" />
     <ClCompile Include="..\..\lib\zlib\crc32.c" />
@@ -171,6 +173,7 @@
     <ClCompile Include="..\..\mm7_data.cpp" />
     <ClCompile Include="..\..\Monsters.cpp" />
     <ClCompile Include="..\..\Mouse.cpp" />
+    <ClCompile Include="..\..\NewUI\Core\UIControlModule_wrap.cxx" />
     <ClCompile Include="..\..\NewUI\MainMenu.cpp" />
     <ClCompile Include="..\..\NPC.cpp" />
     <ClCompile Include="..\..\ObjectList.cpp" />
@@ -320,7 +323,6 @@
     <ClInclude Include="..\..\LOD.h" />
     <ClInclude Include="..\..\Log.h" />
     <ClInclude Include="..\..\MapInfo.h" />
-    <ClInclude Include="..\..\Math.h" />
     <ClInclude Include="..\..\MM7.h" />
     <ClInclude Include="..\..\mm7_data.h" />
     <ClInclude Include="..\..\Monsters.h" />
@@ -333,6 +335,7 @@
     <ClInclude Include="..\..\OSAPI.h" />
     <ClInclude Include="..\..\OSInfo.h" />
     <ClInclude Include="..\..\OSWindow.h" />
+    <ClInclude Include="..\..\OurMath.h" />
     <ClInclude Include="..\..\Outdoor.h" />
     <ClInclude Include="..\..\Outdoor_stuff.h" />
     <ClInclude Include="..\..\Overlays.h" />
@@ -375,6 +378,13 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\lib\legacy_dx\d3dvec.inl" />
+    <None Include="..\..\lib\swig.bat" />
+    <CustomBuild Include="..\..\NewUI\Core\UIControlModule.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>
+    <None Include="..\..\lib\swig\swigwin-2.0.11\UIControlModule.swig" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
--- a/Build/Visual Studio 2010/World of Might and Magic.vcxproj.filters	Fri Nov 22 23:28:02 2013 +0600
+++ b/Build/Visual Studio 2010/World of Might and Magic.vcxproj.filters	Mon Nov 25 16:44:53 2013 +0600
@@ -31,81 +31,15 @@
     <ClInclude Include="..\..\Indoor_stuff.h" />
     <ClInclude Include="..\..\Items.h" />
     <ClInclude Include="..\..\Keyboard.h" />
-    <ClInclude Include="..\..\Level\Decoration.h" />
-    <ClInclude Include="..\..\lib\legacy_dx\d3d.h" />
-    <ClInclude Include="..\..\lib\legacy_dx\d3dcaps.h" />
-    <ClInclude Include="..\..\lib\legacy_dx\d3drm.h" />
-    <ClInclude Include="..\..\lib\legacy_dx\d3drmdef.h" />
-    <ClInclude Include="..\..\lib\legacy_dx\d3drmobj.h" />
-    <ClInclude Include="..\..\lib\legacy_dx\d3drmwin.h" />
-    <ClInclude Include="..\..\lib\legacy_dx\d3dtypes.h" />
-    <ClInclude Include="..\..\lib\legacy_dx\ddraw.h" />
-    <ClInclude Include="..\..\lib\legacy_dx\dinput.h" />
-    <ClInclude Include="..\..\lib\legacy_dx\dinputd.h" />
-    <ClInclude Include="..\..\lib\legacy_dx\dmdls.h" />
-    <ClInclude Include="..\..\lib\legacy_dx\dmerror.h" />
-    <ClInclude Include="..\..\lib\legacy_dx\dmksctrl.h" />
-    <ClInclude Include="..\..\lib\legacy_dx\dmplugin.h" />
-    <ClInclude Include="..\..\lib\legacy_dx\dmusbuff.h" />
-    <ClInclude Include="..\..\lib\legacy_dx\dmusicc.h" />
-    <ClInclude Include="..\..\lib\legacy_dx\dmusicf.h" />
-    <ClInclude Include="..\..\lib\legacy_dx\dmusici.h" />
-    <ClInclude Include="..\..\lib\legacy_dx\dmusics.h" />
-    <ClInclude Include="..\..\lib\legacy_dx\dsconf.h" />
-    <ClInclude Include="..\..\lib\legacy_dx\dsound.h" />
-    <ClInclude Include="..\..\lib\legacy_dx\dvoice.h" />
-    <ClInclude Include="..\..\lib\legacy_dx\multimon.h" />
-    <ClInclude Include="..\..\lib\legacy_dx\rmxfguid.h" />
-    <ClInclude Include="..\..\lib\legacy_dx\rmxftmpl.h" />
-    <ClInclude Include="..\..\lib\legacy_dx\strsafe.h" />
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lapi.h" />
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lauxlib.h" />
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lcode.h" />
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lctype.h" />
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\ldebug.h" />
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\ldo.h" />
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lfunc.h" />
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lgc.h" />
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\llex.h" />
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\llimits.h" />
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lmem.h" />
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lobject.h" />
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lopcodes.h" />
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lparser.h" />
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lstate.h" />
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lstring.h" />
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\ltable.h" />
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\ltm.h" />
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lua.h" />
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\luaconf.h" />
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lualib.h" />
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lundump.h" />
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lvm.h" />
-    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lzio.h" />
-    <ClInclude Include="..\..\lib\lua\lua.h" />
-    <ClInclude Include="..\..\lib\zlib\deflate.h" />
-    <ClInclude Include="..\..\lib\zlib\infblock.h" />
-    <ClInclude Include="..\..\lib\zlib\infcodes.h" />
-    <ClInclude Include="..\..\lib\zlib\inffast.h" />
-    <ClInclude Include="..\..\lib\zlib\inffixed.h" />
-    <ClInclude Include="..\..\lib\zlib\inftrees.h" />
-    <ClInclude Include="..\..\lib\zlib\infutil.h" />
-    <ClInclude Include="..\..\lib\zlib\trees.h" />
-    <ClInclude Include="..\..\lib\zlib\zconf.h" />
-    <ClInclude Include="..\..\lib\zlib\zlib.h" />
-    <ClInclude Include="..\..\lib\zlib\zutil.h" />
     <ClInclude Include="..\..\LightmapBuilder.h" />
     <ClInclude Include="..\..\Lights.h" />
     <ClInclude Include="..\..\LOD.h" />
     <ClInclude Include="..\..\Log.h" />
     <ClInclude Include="..\..\MapInfo.h" />
-    <ClInclude Include="..\..\Math.h" />
     <ClInclude Include="..\..\MM7.h" />
     <ClInclude Include="..\..\mm7_data.h" />
     <ClInclude Include="..\..\Monsters.h" />
     <ClInclude Include="..\..\Mouse.h" />
-    <ClInclude Include="..\..\NewUI\Core\UIControl.h" />
-    <ClInclude Include="..\..\NewUI\MainMenu.h" />
     <ClInclude Include="..\..\NPC.h" />
     <ClInclude Include="..\..\NZIArray.h" />
     <ClInclude Include="..\..\ObjectList.h" />
@@ -143,14 +77,214 @@
     <ClInclude Include="..\..\TileFrameTable.h" />
     <ClInclude Include="..\..\Time.h" />
     <ClInclude Include="..\..\TurnEngine.h" />
-    <ClInclude Include="..\..\UI\UIBooks.h" />
-    <ClInclude Include="..\..\UI\UIHouses.h" />
     <ClInclude Include="..\..\VectorTypes.h" />
     <ClInclude Include="..\..\VideoPlayer.h" />
     <ClInclude Include="..\..\Viewport.h" />
     <ClInclude Include="..\..\Vis.h" />
     <ClInclude Include="..\..\Weather.h" />
     <ClInclude Include="..\..\TestClass.h" />
+    <ClInclude Include="..\..\NewUI\MainMenu.h">
+      <Filter>NewUI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\NewUI\Core\UIControl.h">
+      <Filter>NewUI\Core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Level\Decoration.h">
+      <Filter>Level</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\d3d.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\ddraw.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\d3dcaps.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\d3drm.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\d3drmdef.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\d3drmobj.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\d3drmwin.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\d3dtypes.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\dinput.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\dvoice.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\dinputd.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\dmdls.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\dmerror.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\dmksctrl.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\dmplugin.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\dmusbuff.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\dmusicc.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\dmusicf.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\dmusici.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\dmusics.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\dsconf.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\dsound.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\multimon.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\rmxfguid.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\rmxftmpl.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\legacy_dx\strsafe.h">
+      <Filter>lib\legacy_dx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua.h">
+      <Filter>lib\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lgc.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lapi.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lauxlib.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lcode.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lctype.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\ldebug.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\ldo.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lfunc.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lobject.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\llex.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\llimits.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lmem.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lzio.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lopcodes.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lparser.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lstate.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lstring.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\ltable.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\ltm.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lua.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\luaconf.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lualib.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lundump.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\lua\lua-5.2.2\lvm.h">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\OurMath.h" />
+    <ClInclude Include="..\..\lib\zlib\deflate.h">
+      <Filter>lib\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\zlib\infutil.h">
+      <Filter>lib\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\zlib\infblock.h">
+      <Filter>lib\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\zlib\infcodes.h">
+      <Filter>lib\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\zlib\inffast.h">
+      <Filter>lib\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\zlib\inffixed.h">
+      <Filter>lib\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\zlib\inftrees.h">
+      <Filter>lib\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\zlib\trees.h">
+      <Filter>lib\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\zlib\zconf.h">
+      <Filter>lib\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\zlib\zlib.h">
+      <Filter>lib\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\lib\zlib\zutil.h">
+      <Filter>lib\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\UI\UIBooks.h">
+      <Filter>UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\UI\UIHouses.h">
+      <Filter>UI</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="lib">
@@ -180,12 +314,26 @@
     <Filter Include="lib\swig">
       <UniqueIdentifier>{2b5db0d5-d6c8-4aad-b295-ac2b5df51fb2}</UniqueIdentifier>
     </Filter>
-    <Filter Include="lib\swig\swiwin-2.0.11">
+    <Filter Include="lib\lua">
+      <UniqueIdentifier>{247dd8f2-a9fc-4e53-bc8c-d8bbe255bfe4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lib\lua\lua-5.2.2">
+      <UniqueIdentifier>{410b9d18-77b5-461d-8b23-ba841039152e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lib\swig\swigwin-2.0.11">
       <UniqueIdentifier>{cb1041ae-addb-49d8-9ec1-ffe52d29ae64}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\lib\legacy_dx\d3dvec.inl" />
+    <None Include="..\..\lib\legacy_dx\d3dvec.inl">
+      <Filter>lib\legacy_dx</Filter>
+    </None>
+    <None Include="..\..\lib\swig.bat">
+      <Filter>lib</Filter>
+    </None>
+    <None Include="..\..\lib\swig\swigwin-2.0.11\UIControlModule.swig">
+      <Filter>lib\swig\swigwin-2.0.11</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Actor.cpp" />
@@ -214,53 +362,6 @@
     <ClCompile Include="..\..\IndoorCameraD3D.cpp" />
     <ClCompile Include="..\..\Items.cpp" />
     <ClCompile Include="..\..\Keyboard.cpp" />
-    <ClCompile Include="..\..\Level\Decoration.cpp" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lapi.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lauxlib.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lbaselib.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lbitlib.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lcode.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lcorolib.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lctype.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\ldblib.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\ldebug.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\ldo.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\ldump.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lfunc.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lgc.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\linit.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\liolib.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\llex.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lmathlib.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lmem.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\loadlib.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lobject.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lopcodes.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\loslib.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lparser.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lstate.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lstring.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lstrlib.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\ltable.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\ltablib.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\ltm.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lua.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lundump.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lvm.c" />
-    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lzio.c" />
-    <ClCompile Include="..\..\lib\zlib\adler32.c" />
-    <ClCompile Include="..\..\lib\zlib\compress.c" />
-    <ClCompile Include="..\..\lib\zlib\crc32.c" />
-    <ClCompile Include="..\..\lib\zlib\deflate.c" />
-    <ClCompile Include="..\..\lib\zlib\infblock.c" />
-    <ClCompile Include="..\..\lib\zlib\infcodes.c" />
-    <ClCompile Include="..\..\lib\zlib\inffast.c" />
-    <ClCompile Include="..\..\lib\zlib\inflate.c" />
-    <ClCompile Include="..\..\lib\zlib\inftrees.c" />
-    <ClCompile Include="..\..\lib\zlib\infutil.c" />
-    <ClCompile Include="..\..\lib\zlib\trees.c" />
-    <ClCompile Include="..\..\lib\zlib\uncompr.c" />
-    <ClCompile Include="..\..\lib\zlib\zutil.c" />
     <ClCompile Include="..\..\LightmapBuilder.cpp" />
     <ClCompile Include="..\..\LightsStack.cpp" />
     <ClCompile Include="..\..\LOD.cpp" />
@@ -275,7 +376,6 @@
     <ClCompile Include="..\..\mm7_data.cpp" />
     <ClCompile Include="..\..\Monsters.cpp" />
     <ClCompile Include="..\..\Mouse.cpp" />
-    <ClCompile Include="..\..\NewUI\MainMenu.cpp" />
     <ClCompile Include="..\..\NPC.cpp" />
     <ClCompile Include="..\..\ObjectList.cpp" />
     <ClCompile Include="..\..\OSAPI.cpp" />
@@ -301,34 +401,214 @@
     <ClCompile Include="..\..\TileTable.cpp" />
     <ClCompile Include="..\..\Time.cpp" />
     <ClCompile Include="..\..\TurnEngine.cpp" />
-    <ClCompile Include="..\..\UI\Books\UIMapBook.cpp" />
-    <ClCompile Include="..\..\UI\Books\UINotesBooks.cpp" />
-    <ClCompile Include="..\..\UI\Books\UISpellBook.cpp" />
-    <ClCompile Include="..\..\UI\UIBooks.cpp" />
-    <ClCompile Include="..\..\UI\UICharacter.cpp" />
-    <ClCompile Include="..\..\UI\UiGame.cpp" />
-    <ClCompile Include="..\..\UI\UIGuilds.cpp" />
-    <ClCompile Include="..\..\UI\UIHouses.cpp" />
-    <ClCompile Include="..\..\UI\UIMainMenu.cpp" />
-    <ClCompile Include="..\..\UI\UIMsgProc.cpp" />
-    <ClCompile Include="..\..\UI\UIOptions.cpp" />
-    <ClCompile Include="..\..\UI\UIPartyCreation.cpp" />
-    <ClCompile Include="..\..\UI\UIPopup.cpp" />
-    <ClCompile Include="..\..\UI\UIRest.cpp" />
-    <ClCompile Include="..\..\UI\UISaveLoad.cpp" />
-    <ClCompile Include="..\..\UI\UIShops.cpp" />
-    <ClCompile Include="..\..\UI\UITransition.cpp" />
     <ClCompile Include="..\..\VectorTypes.cpp" />
     <ClCompile Include="..\..\VideoPlayer.cpp" />
     <ClCompile Include="..\..\Viewport.cpp" />
     <ClCompile Include="..\..\Vis.cpp" />
     <ClCompile Include="..\..\Weather.cpp" />
     <ClCompile Include="..\..\_deleted.cpp" />
-    <ClCompile Include="..\..\lib\swig\swigwin-2.0.11\UIControlModule_wrap.cxx">
-      <Filter>lib\swig\swiwin-2.0.11</Filter>
+    <ClCompile Include="..\..\NewUI\Core\UIControlModule_wrap.cxx">
+      <Filter>NewUI\Core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\NewUI\MainMenu.cpp">
+      <Filter>NewUI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Level\Decoration.cpp">
+      <Filter>Level</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lapi.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lauxlib.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lbaselib.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lbitlib.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lcode.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lcorolib.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lctype.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\ldblib.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\ldebug.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\ldo.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\ldump.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lfunc.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lgc.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\linit.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\liolib.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\llex.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lmathlib.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lmem.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\loadlib.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lobject.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lopcodes.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\loslib.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lparser.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lstate.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lstring.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lstrlib.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\ltable.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\ltablib.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\ltm.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lua.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\lib\swig\swigwin-2.0.11\TestModule_wrap.cxx">
-      <Filter>lib\swig\swiwin-2.0.11</Filter>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lundump.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lvm.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\lua\lua-5.2.2\lzio.c">
+      <Filter>lib\lua\lua-5.2.2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\zlib\adler32.c">
+      <Filter>lib\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\zlib\compress.c">
+      <Filter>lib\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\zlib\crc32.c">
+      <Filter>lib\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\zlib\deflate.c">
+      <Filter>lib\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\zlib\infblock.c">
+      <Filter>lib\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\zlib\infcodes.c">
+      <Filter>lib\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\zlib\inffast.c">
+      <Filter>lib\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\zlib\inflate.c">
+      <Filter>lib\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\zlib\inftrees.c">
+      <Filter>lib\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\zlib\infutil.c">
+      <Filter>lib\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\zlib\trees.c">
+      <Filter>lib\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\zlib\uncompr.c">
+      <Filter>lib\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib\zlib\zutil.c">
+      <Filter>lib\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\UIBooks.cpp">
+      <Filter>UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\UITransition.cpp">
+      <Filter>UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\UICharacter.cpp">
+      <Filter>UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\UiGame.cpp">
+      <Filter>UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\UIGuilds.cpp">
+      <Filter>UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\UIHouses.cpp">
+      <Filter>UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\UIMainMenu.cpp">
+      <Filter>UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\UIMsgProc.cpp">
+      <Filter>UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\UIOptions.cpp">
+      <Filter>UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\UIPartyCreation.cpp">
+      <Filter>UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\UIPopup.cpp">
+      <Filter>UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\UIRest.cpp">
+      <Filter>UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\UISaveLoad.cpp">
+      <Filter>UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\UIShops.cpp">
+      <Filter>UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\Books\UIMapBook.cpp">
+      <Filter>UI\Books</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\Books\UISpellBook.cpp">
+      <Filter>UI\Books</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UI\Books\UINotesBooks.cpp">
+      <Filter>UI\Books</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\NewUI\Core\UIControlModule.swig">
+      <Filter>NewUI\Core</Filter>
+    </CustomBuild>
+  </ItemGroup>
 </Project>
\ No newline at end of file
--- a/lib/swig.bat	Fri Nov 22 23:28:02 2013 +0600
+++ b/lib/swig.bat	Mon Nov 25 16:44:53 2013 +0600
@@ -1,15 +1,15 @@
-rem echo 1 %1
-rem echo 2 %2
-rem echo 3 %3
-rem echo 4 %4
-rem echo 5 %5
-rem echo 6 %6
+echo 1 %1
+echo 2 %2
+echo 3 %3
+echo 4 %4
+echo 5 %5
+echo 6 %6
 
-rem echo xcopy %4 "../../lib/swig/swigwin-2.0.11" /y
+echo xcopy %4 "../../lib/swig/swigwin-2.0.11" /y
 xcopy %4 "../../lib/swig/swigwin-2.0.11" /y
 
 cd ../../lib/swig/swigwin-2.0.11
 swig -c++ -lua %3
 
-rem echo xcopy "%6  %5"%2" /y
-xcopy "%6  %5"%2" /y
\ No newline at end of file
+echo xcopy "%6" %5"%2" /y
+xcopy "%6" %5"%2" /y
\ No newline at end of file
--- a/lib/swig/swigwin-2.0.11/UIControlModule.swig	Fri Nov 22 23:28:02 2013 +0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-%module UIControl
-%{
-#include "UIControl.h"
-%}
-
-%include "../../../NewUI/Core/UIControl.h"
\ No newline at end of file