# HG changeset patch
# User Ritor1
# Date 1385376293 -21600
# Node ID ea8e801fdeab991b3872629eadc8fefc910bbe2b
# Parent d4cc4d71d9cf1293b36c9bf461264342445bbdc4
swig.bat
diff -r d4cc4d71d9cf -r ea8e801fdeab Build/Visual Studio 2010/World of Might and Magic.vcxproj
--- 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 @@
$(Configuration)\
$(WoMM_MM7_INSTALL_DIR)\
false
+ $(SolutionDir)../../;$(IncludePath)
false
@@ -63,6 +64,9 @@
..\..\lib\legacy_dx\lib\ddraw.lib;..\..\lib\legacy_dx\lib\dxguid.lib;%(AdditionalDependencies)
$(OutDir)$(TargetName)$(TargetExt)
+
+ XCOPY "$(SolutionDir)../../Scripts" "$(OutDir)data/scripts/lua/core" /E /I /F /R /Y
+
@@ -142,8 +146,6 @@
-
-
@@ -171,6 +173,7 @@
+
@@ -320,7 +323,6 @@
-
@@ -333,6 +335,7 @@
+
@@ -375,6 +378,13 @@
+
+
+ Document
+ call "../../lib/swig" "%(FileName)" %(RelativeDir) "%(FileName)%(Extension)" "%(FullPath)" "$(SolutionDir)" %(Filename)_wrap.cxx
+ %(Filename)_wrap.cxx
+
+
diff -r d4cc4d71d9cf -r ea8e801fdeab Build/Visual Studio 2010/World of Might and Magic.vcxproj.filters
--- 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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -143,14 +77,214 @@
-
-
+
+ NewUI
+
+
+ NewUI\Core
+
+
+ Level
+
+
+ lib\legacy_dx
+
+
+ lib\legacy_dx
+
+
+ lib\legacy_dx
+
+
+ lib\legacy_dx
+
+
+ lib\legacy_dx
+
+
+ lib\legacy_dx
+
+
+ lib\legacy_dx
+
+
+ lib\legacy_dx
+
+
+ lib\legacy_dx
+
+
+ lib\legacy_dx
+
+
+ lib\legacy_dx
+
+
+ lib\legacy_dx
+
+
+ lib\legacy_dx
+
+
+ lib\legacy_dx
+
+
+ lib\legacy_dx
+
+
+ lib\legacy_dx
+
+
+ lib\legacy_dx
+
+
+ lib\legacy_dx
+
+
+ lib\legacy_dx
+
+
+ lib\legacy_dx
+
+
+ lib\legacy_dx
+
+
+ lib\legacy_dx
+
+
+ lib\legacy_dx
+
+
+ lib\legacy_dx
+
+
+ lib\legacy_dx
+
+
+ lib\legacy_dx
+
+
+ lib\lua
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+
+ lib\zlib
+
+
+ lib\zlib
+
+
+ lib\zlib
+
+
+ lib\zlib
+
+
+ lib\zlib
+
+
+ lib\zlib
+
+
+ lib\zlib
+
+
+ lib\zlib
+
+
+ lib\zlib
+
+
+ lib\zlib
+
+
+ lib\zlib
+
+
+ UI
+
+
+ UI
+
@@ -180,12 +314,26 @@
{2b5db0d5-d6c8-4aad-b295-ac2b5df51fb2}
-
+
+ {247dd8f2-a9fc-4e53-bc8c-d8bbe255bfe4}
+
+
+ {410b9d18-77b5-461d-8b23-ba841039152e}
+
+
{cb1041ae-addb-49d8-9ec1-ffe52d29ae64}
-
+
+ lib\legacy_dx
+
+
+ lib
+
+
+ lib\swig\swigwin-2.0.11
+
@@ -214,53 +362,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -275,7 +376,6 @@
-
@@ -301,34 +401,214 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- lib\swig\swiwin-2.0.11
+
+ NewUI\Core
+
+
+ NewUI
+
+
+ Level
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
-
- lib\swig\swiwin-2.0.11
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\lua\lua-5.2.2
+
+
+ lib\zlib
+
+
+ lib\zlib
+
+
+ lib\zlib
+
+
+ lib\zlib
+
+
+ lib\zlib
+
+
+ lib\zlib
+
+
+ lib\zlib
+
+
+ lib\zlib
+
+
+ lib\zlib
+
+
+ lib\zlib
+
+
+ lib\zlib
+
+
+ lib\zlib
+
+
+ lib\zlib
+
+
+ UI
+
+
+ UI
+
+
+ UI
+
+
+ UI
+
+
+ UI
+
+
+ UI
+
+
+ UI
+
+
+ UI
+
+
+ UI
+
+
+ UI
+
+
+ UI
+
+
+ UI
+
+
+ UI
+
+
+ UI
+
+
+ UI\Books
+
+
+ UI\Books
+
+
+ UI\Books
+
+
+ NewUI\Core
+
+
\ No newline at end of file
diff -r d4cc4d71d9cf -r ea8e801fdeab lib/swig.bat
--- 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
diff -r d4cc4d71d9cf -r ea8e801fdeab lib/swig/swigwin-2.0.11/UIControlModule.swig
--- 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