Mercurial > ldforge / changeset

--- a/CMakeLists.txt	Thu Feb 06 20:43:22 2014 +0200
+++ b/CMakeLists.txt	Sat Feb 22 16:39:26 2014 +0200
@@ -102,6 +102,7 @@
 set (LDForgeResources ldforge.qrc)
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -W -Wall")
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lGLU")
+include_directories ("${PROJECT_BINARY_DIR}")
 include_directories ("${PROJECT_BINARY_DIR}/src")
 include_directories ("${PROJECT_BINARY_DIR}/src/misc")
 
@@ -116,7 +117,8 @@
 add_executable (ldforge
 	${LDForgeSources}
 	${LDForgeResourcesRCC}
-    ${LDForgeFormsHeaders}
+	${LDForgeFormsHeaders}
+	${LDForgeMOC}
 )
 
 target_link_libraries (ldforge

--- a/src/AddObjectDialog.cc	Thu Feb 06 20:43:22 2014 +0200
+++ b/src/AddObjectDialog.cc	Sat Feb 22 16:39:26 2014 +0200
@@ -34,7 +34,6 @@
 #include "Widgets.h"
 #include "Misc.h"
 #include "Primitives.h"
-#include "moc_AddObjectDialog.cxx"
 
 // =============================================================================
 // -----------------------------------------------------------------------------

--- a/src/ColorSelector.cc	Thu Feb 06 20:43:22 2014 +0200
+++ b/src/ColorSelector.cc	Sat Feb 22 16:39:26 2014 +0200
@@ -31,7 +31,6 @@
 #include "Configuration.h"
 #include "Misc.h"
 #include "ui_colorsel.h"
-#include "moc_ColorSelector.cxx"
 
 static const int g_numColumns = 16;
 static const int g_squareSize = 32;

--- a/src/ConfigurationDialog.cc	Thu Feb 06 20:43:22 2014 +0200
+++ b/src/ConfigurationDialog.cc	Sat Feb 22 16:39:26 2014 +0200
@@ -38,7 +38,6 @@
 #include "ColorSelector.h"
 #include "GLRenderer.h"
 #include "ui_config.h"
-#include "moc_ConfigurationDialog.cxx"
 
 extern_cfg (String, gl_bgcolor);
 extern_cfg (String, gl_maincolor);

--- a/src/Dialogs.cc	Thu Feb 06 20:43:22 2014 +0200
+++ b/src/Dialogs.cc	Sat Feb 22 16:39:26 2014 +0200
@@ -43,7 +43,6 @@
 #include "ui_extprogpath.h"
 #include "ui_about.h"
 #include "ui_bombbox.h"
-#include "moc_Dialogs.cxx"
 
 extern const char* g_extProgPathFilter;
 extern_cfg (String, io_ldpath);

--- a/src/Document.cc	Thu Feb 06 20:43:22 2014 +0200
+++ b/src/Document.cc	Sat Feb 22 16:39:26 2014 +0200
@@ -29,7 +29,6 @@
 #include "Dialogs.h"
 #include "GLRenderer.h"
 #include "misc/InvokationDeferer.h"
-#include "moc_Document.cxx"
 
 cfg (String, io_ldpath, "");
 cfg (List, io_recentfiles, {});

--- a/src/GLRenderer.cc	Thu Feb 06 20:43:22 2014 +0200
+++ b/src/GLRenderer.cc	Sat Feb 22 16:39:26 2014 +0200
@@ -38,7 +38,6 @@
 #include "MessageLog.h"
 #include "Primitives.h"
 #include "misc/RingFinder.h"
-#include "moc_GLRenderer.cxx"
 
 static const LDFixedCameraInfo g_FixedCameras[6] =
 {

--- a/src/MainWindow.cc	Thu Feb 06 20:43:22 2014 +0200
+++ b/src/MainWindow.cc	Sat Feb 22 16:39:26 2014 +0200
@@ -48,7 +48,6 @@
 #include "MessageLog.h"
 #include "Configuration.h"
 #include "ui_ldforge.h"
-#include "moc_MainWindow.cxx"
 
 static bool g_isSelectionLocked = false;
 

--- a/src/MessageLog.cc	Thu Feb 06 20:43:22 2014 +0200
+++ b/src/MessageLog.cc	Sat Feb 22 16:39:26 2014 +0200
@@ -21,7 +21,6 @@
 #include "MessageLog.h"
 #include "GLRenderer.h"
 #include "MainWindow.h"
-#include "moc_MessageLog.cxx"
 
 static const int g_maxMessages = 5;
 static const int g_expiry = 5;

--- a/src/PartDownloader.cc	Thu Feb 06 20:43:22 2014 +0200
+++ b/src/PartDownloader.cc	Sat Feb 22 16:39:26 2014 +0200
@@ -29,7 +29,6 @@
 #include "Document.h"
 #include "GLRenderer.h"
 #include "ConfigurationDialog.h"
-#include "moc_PartDownloader.cxx"
 
 cfg (String,	net_downloadpath,	"");
 cfg (Bool,		net_guesspaths,	true);

--- a/src/Primitives.cc	Thu Feb 06 20:43:22 2014 +0200
+++ b/src/Primitives.cc	Sat Feb 22 16:39:26 2014 +0200
@@ -25,7 +25,6 @@
 #include "ui_makeprim.h"
 #include "Misc.h"
 #include "Colors.h"
-#include "moc_Primitives.cxx"
 
 QList<PrimitiveCategory*> g_PrimitiveCategories;
 QList<Primitive> g_primitives;

--- a/src/Widgets.cc	Thu Feb 06 20:43:22 2014 +0200
+++ b/src/Widgets.cc	Sat Feb 22 16:39:26 2014 +0200
@@ -27,7 +27,6 @@
 #include <map>
 
 #include "Widgets.h"
-#include "moc_Widgets.cxx"
 
 // =============================================================================
 // -----------------------------------------------------------------------------

--- a/src/misc/InvokationDeferer.cc	Thu Feb 06 20:43:22 2014 +0200
+++ b/src/misc/InvokationDeferer.cc	Sat Feb 22 16:39:26 2014 +0200
@@ -16,7 +16,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "moc_InvokationDeferer.cxx"
 #include "InvokationDeferer.h"
 #include "../Misc.h"