From 0b746f756ad45b796e95e72528fa01f924d702b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnther=20Brammer?= <gbrammer@gmx.de>
Date: Mon, 13 Dec 2010 03:11:06 +0100
Subject: [PATCH] Autotools: Add new editor files and rename a new header to .h

If it's #included, it's a header, even if it looks like a normal
compilation unit.
---
 CMakeLists.txt                                            | 2 +-
 Makefile.am                                               | 8 ++++++--
 src/editor/C4ConsoleGTK.cpp                               | 3 +--
 .../{C4ConsoleGUICommon.cpp => C4ConsoleGUICommon.h}      | 6 ------
 src/editor/C4ConsoleWin32.cpp                             | 3 +--
 5 files changed, 9 insertions(+), 13 deletions(-)
 rename src/editor/{C4ConsoleGUICommon.cpp => C4ConsoleGUICommon.h} (96%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23e3b8eb0..22eb2c3bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -173,7 +173,7 @@ set(OC_CLONK_SOURCES
 	src/editor/C4Console.cpp
 	src/editor/C4Console.h
 	src/editor/C4ConsoleGUI.h
-	src/editor/C4ConsoleGUICommon.cpp
+	src/editor/C4ConsoleGUICommon.h
 	src/editor/C4DevmodeDlg.cpp
 	src/editor/C4DevmodeDlg.h
 	src/editor/C4EditCursor.cpp
diff --git a/Makefile.am b/Makefile.am
index 48049b231..1fff6190d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -219,6 +219,8 @@ src/control/C4Teams.cpp \
 src/control/C4Teams.h \
 src/editor/C4Console.cpp \
 src/editor/C4Console.h \
+src/editor/C4ConsoleGUI.h \
+src/editor/C4ConsoleGUICommon.h \
 src/editor/C4DevmodeDlg.cpp \
 src/editor/C4DevmodeDlg.h \
 src/editor/C4EditCursor.cpp \
@@ -438,6 +440,8 @@ src/platform/C4ViewportWindow.cpp \
 src/platform/C4ViewportWindow.h \
 src/platform/OpenURL.cpp \
 src/platform/PlatformAbstraction.h \
+src/platform/StdAppCommon.h \
+src/platform/StdAppCommon.cpp \
 src/platform/StdConfig.cpp \
 src/platform/StdConfig.h \
 src/platform/StdD3D.cpp \
@@ -527,7 +531,7 @@ src/C4Version.h.in
 ##hgrevision.h
 
 if WIN32
-clonk_SOURCES += src/platform/C4FileClasses.cpp
+clonk_SOURCES += src/platform/C4FileClasses.cpp src/editor/C4ConsoleWin32.cpp
 clonk_SOURCES += src/res/engine.rc src/res/resource.h
 clonk_SOURCES += src/platform/StdJoystick.cpp src/platform/StdJoystick.h
 endif
@@ -544,7 +548,7 @@ clonk_SOURCES += src/platform/StdXApp.cpp src/platform/StdXWindow.cpp src/platfo
 endif
 endif
 if DEVELOPER_MODE
-clonk_SOURCES += src/platform/StdGtkWindow.cpp src/platform/StdGtkWindow.h
+clonk_SOURCES += src/platform/StdGtkWindow.cpp src/platform/StdGtkWindow.h src/editor/C4ConsoleGTK.cpp
 endif
 
 clonk_LDADD = \
diff --git a/src/editor/C4ConsoleGTK.cpp b/src/editor/C4ConsoleGTK.cpp
index f2340e3b9..628906f65 100644
--- a/src/editor/C4ConsoleGTK.cpp
+++ b/src/editor/C4ConsoleGTK.cpp
@@ -1719,5 +1719,4 @@ void C4ToolsDlg::State::OnWindowHide(GtkWidget* widget, gpointer data)
 	static_cast<C4ToolsDlg::State*>(data)->GetOwner()->Active = false;
 }
 
-#define CONSOLEGUICOMMONINCLUDE
-#include "C4ConsoleGUICommon.cpp"
+#include "C4ConsoleGUICommon.h"
diff --git a/src/editor/C4ConsoleGUICommon.cpp b/src/editor/C4ConsoleGUICommon.h
similarity index 96%
rename from src/editor/C4ConsoleGUICommon.cpp
rename to src/editor/C4ConsoleGUICommon.h
index 7d2670ca0..5bdfd3d5f 100644
--- a/src/editor/C4ConsoleGUICommon.cpp
+++ b/src/editor/C4ConsoleGUICommon.h
@@ -15,10 +15,6 @@
 
 // To be directly included by platform-specific implementations
 
-#include <C4Include.h>
-
-#ifdef CONSOLEGUICOMMONINCLUDE
-
 C4ConsoleGUI::C4ConsoleGUI()
 {
 	state = new C4ConsoleGUI::State(this);
@@ -90,5 +86,3 @@ void C4PropertyDlg::Clear()
 }
 
 const char *C4ConsoleGUI::LIST_DIVIDER = "divid0r";
-
-#endif
diff --git a/src/editor/C4ConsoleWin32.cpp b/src/editor/C4ConsoleWin32.cpp
index ecc9daa03..b6b6fe339 100644
--- a/src/editor/C4ConsoleWin32.cpp
+++ b/src/editor/C4ConsoleWin32.cpp
@@ -1197,5 +1197,4 @@ void C4ConsoleGUI::ToolsDlgEnableControls(C4ToolsDlg *dlg)
 	EnableWindow(GetDlgItem(hDialog,IDC_PREVIEW),(iLandscapeMode>=C4LSC_Static));
 }
 
-#define CONSOLEGUICOMMONINCLUDE
-#include "C4ConsoleGUICommon.cpp"
+#include "C4ConsoleGUICommon.h"