Update solution files for the required MOC(ing) of widgets broken in 6…

…4c2fde
Warzone2100 · Mar 31, 2013 · e0df2d4 · e0df2d4
1 parent 753456e
commit e0df2d4
Show file tree

Hide file tree

Showing 13 changed files with 54 additions and 4 deletions.
diff --git a/lib/widget/bar.cpp b/lib/widget/bar.cpp
@@ -26,6 +26,9 @@
 #include "tip.h"
 #include "form.h"
 #include "bar.h"
+#if defined(WZ_CC_MSVC)
+#include "bar_moc.h"		// this is generated on the pre-build event.
+#endif
 // FIXME Direct iVis implementation include!
 #include "lib/ivis_opengl/pieblitfunc.h"
 #include "lib/ivis_opengl/piepalette.h"

diff --git a/lib/widget/button.cpp b/lib/widget/button.cpp
@@ -26,6 +26,9 @@
 #include "widget.h"
 #include "widgint.h"
 #include "button.h"
+#if defined(WZ_CC_MSVC)
+#include "button_moc.h"		// this is generated on the pre-build event.
+#endif
 #include "form.h"
 #include "tip.h"
 #include "lib/ivis_opengl/pieblitfunc.h"

diff --git a/lib/widget/editbox.cpp b/lib/widget/editbox.cpp
@@ -29,6 +29,9 @@
 #include "widget.h"
 #include "widgint.h"
 #include "editbox.h"
+#if defined(WZ_CC_MSVC)
+#include "editbox_moc.h"		// this is generated on the pre-build event.
+#endif
 #include "form.h"
 // FIXME Direct iVis implementation include!
 #include "lib/ivis_opengl/pieblitfunc.h"

diff --git a/lib/widget/form.cpp b/lib/widget/form.cpp
@@ -27,6 +27,9 @@
 #include "widget.h"
 #include "widgint.h"
 #include "form.h"
+#if defined(WZ_CC_MSVC)
+#include "form_moc.h"		// this is generated on the pre-build event.
+#endif
 #include "tip.h"
 // FIXME Direct iVis implementation include!
 #include "lib/ivis_opengl/pieblitfunc.h"

diff --git a/lib/widget/label.cpp b/lib/widget/label.cpp
@@ -25,6 +25,9 @@
 #include "widget.h"
 #include "widgint.h"
 #include "label.h"
+#if defined(WZ_CC_MSVC)
+#include "label_moc.h"		// this is generated on the pre-build event.
+#endif
 #include "form.h"
 #include "tip.h"
 // FIXME Direct iVis implementation include!

diff --git a/lib/widget/listwidget.cpp b/lib/widget/listwidget.cpp
@@ -22,6 +22,9 @@
  */
 
 #include "listwidget.h"
+#if defined(WZ_CC_MSVC)
+#include "listwidget_moc.h"		// this is generated on the pre-build event.
+#endif
 #include "button.h"
 #include <QtCore/QSignalMapper>
 

diff --git a/lib/widget/slider.cpp b/lib/widget/slider.cpp
@@ -24,6 +24,9 @@
 #include "widget.h"
 #include "widgint.h"
 #include "slider.h"
+#if defined(WZ_CC_MSVC)
+#include "slider_moc.h"		// this is generated on the pre-build event.
+#endif
 // FIXME Direct iVis implementation include!
 #include "lib/ivis_opengl/pieblitfunc.h"
 

diff --git a/lib/widget/widget.cpp b/lib/widget/widget.cpp
@@ -31,6 +31,9 @@
 #include "lib/gamelib/gtime.h"
 
 #include "widget.h"
+#if defined(WZ_CC_MSVC)
+#include "widgbase_moc.h"		// this is generated on the pre-build event.
+#endif
 #include "widgint.h"
 
 #include "form.h"

diff --git a/lib/widget/widget.vcxproj b/lib/widget/widget.vcxproj
@@ -117,6 +117,18 @@
       <WarningLevel>Level4</WarningLevel>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
+    <PreBuildEvent>
+      <Command>$(QTDIR)\bin\moc.exe bar.h. -o bar_moc.h
+$(QTDIR)\bin\moc.exe  button.h -o button_moc.h 
+$(QTDIR)\bin\moc.exe  editbox.h -o editbox_moc.h
+$(QTDIR)\bin\moc.exe  form.h   -o form_moc.h 
+$(QTDIR)\bin\moc.exe  label.h  -o label_moc.h 
+$(QTDIR)\bin\moc.exe  listwidget.h -o listwidget_moc.h 
+$(QTDIR)\bin\moc.exe  slider.h -o slider_moc.h 
+$(QTDIR)\bin\moc.exe  widgbase.h -o widgbase_moc.h
+
+</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SDL_STLport_x32|Win32'">
     <ClCompile>
@@ -205,8 +217,10 @@
     <ClInclude Include="editbox.h" />
     <ClInclude Include="form.h" />
     <ClInclude Include="label.h" />
+    <ClInclude Include="label_moc.h" />
     <ClInclude Include="listwidget.h" />
     <ClInclude Include="slider.h" />
+    <ClInclude Include="slider_moc.h" />
     <ClInclude Include="tip.h" />
     <ClInclude Include="widgbase.h" />
     <ClInclude Include="widget.h" />

diff --git a/lib/widget/widget.vcxproj.filters b/lib/widget/widget.vcxproj.filters
@@ -35,6 +35,9 @@
     <ClCompile Include="widget.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="listwidget.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="bar.h">
@@ -67,5 +70,14 @@
     <ClInclude Include="widgint.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="listwidget.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="label_moc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="slider_moc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/src/Warzone2100.vcxproj b/src/Warzone2100.vcxproj
@@ -148,6 +148,7 @@
     <PreBuildEvent>
       <Message>Generating the autorevison.h file...</Message>
       <Command>$(QTDIR)\bin\moc.exe qtscriptdebug.h  -o qtscriptdebug.h.moc
+$(QTDIR)\bin\moc.exe multiint.h  -o multiint_moc.h
 call $(ProjectDir)..\build_tools\autorevision.bat $(ProjectDir)</Command>
     </PreBuildEvent>
     <BisonParser>
@@ -648,7 +649,6 @@ call $(ProjectDir)..\build_tools\autorevision.bat $(ProjectDir)</Command>
     <ClInclude Include="scriptobj.h" />
     <ClInclude Include="scripttabs.h" />
     <ClInclude Include="scriptvals.h" />
-    <ClInclude Include="scriptvals_parser.hpp" />
     <ClInclude Include="selection.h" />
     <ClInclude Include="seqdisp.h" />
     <ClInclude Include="stats.h" />

diff --git a/src/Warzone2100.vcxproj.filters b/src/Warzone2100.vcxproj.filters
@@ -713,9 +713,6 @@
     <ClInclude Include="qtscriptfuncs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="scriptvals_parser.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="actiondef.h">
       <Filter>Header Files</Filter>
     </ClInclude>

diff --git a/src/multiint.cpp b/src/multiint.cpp
@@ -84,6 +84,9 @@
 
 #include "multiplay.h"
 #include "multiint.h"
+#if defined(WZ_CC_MSVC)
+#include "multiint_moc.h"	// this is generated on the pre-build event.
+#endif
 #include "multijoin.h"
 #include "multistat.h"
 #include "multirecv.h"