citra_qt: Removed autogenerated files from repo and fixed build issues.

xiota · Jun 22, 2014 · 4e4a028 · 4e4a028
1 parent 004df76
commit 4e4a028
Show file tree

Hide file tree

Showing 13 changed files with 9 additions and 711 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,3 +25,6 @@ bin/
 
 # Generated source files
 src/common/scm_rev.cpp
+
+# Generated header files
+src/citra_qt/ui_*.h
diff --git a/src/citra_qt/citra_qt.vcxproj b/src/citra_qt/citra_qt.vcxproj
@@ -168,7 +168,6 @@
   <ItemGroup>
     <ClInclude Include="config\controller_config.hxx" />
     <ClInclude Include="config\controller_config_util.hxx" />
-    <ClInclude Include="ui_controller_config.h" />
     <ClInclude Include="version.h" />
   </ItemGroup>
   <ItemGroup>
@@ -186,4 +185,4 @@
   <ImportGroup Label="ExtensionTargets">
     <Import Project="qt-build.targets" />
   </ImportGroup>
-</Project>
+</Project>
diff --git a/src/citra_qt/citra_qt.vcxproj.filters b/src/citra_qt/citra_qt.vcxproj.filters
@@ -95,9 +95,6 @@
     <ClInclude Include="config\controller_config_util.hxx">
       <Filter>config</Filter>
     </ClInclude>
-    <ClInclude Include="ui_controller_config.h">
-      <Filter>config</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <UIC Include="hotkeys.ui" />
@@ -118,4 +115,4 @@
   <ItemGroup>
     <Text Include="CMakeLists.txt" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/citra_qt/debugger/callstack.hxx b/src/citra_qt/debugger/callstack.hxx
@@ -1,5 +1,5 @@
 #include <QDockWidget>
-#include "../ui_callstack.h"
+#include "ui_callstack.h"
 
 class QStandardItemModel;
 

diff --git a/src/citra_qt/debugger/disassembler.hxx b/src/citra_qt/debugger/disassembler.hxx
@@ -1,5 +1,5 @@
 #include <QDockWidget>
-#include "../ui_disassembler.h"
+#include "ui_disassembler.h"
 
 #include "common/common.h"
 #include "common/break_points.h"

diff --git a/src/citra_qt/debugger/registers.hxx b/src/citra_qt/debugger/registers.hxx
@@ -1,4 +1,4 @@
-#include "../ui_registers.h"
+#include "ui_registers.h"
 
 #include <QDockWidget>
 #include <QTreeWidgetItem>

diff --git a/src/citra_qt/ui_callstack.h b/src/citra_qt/ui_callstack.h
diff --git a/src/citra_qt/ui_controller_config.h b/src/citra_qt/ui_controller_config.h