marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
Günther Brammer 2010-12-13 03:11:06 +01:00
parent 610276e56d
commit 0b746f756a
5 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -173,7 +173,7 @@ set(OC_CLONK_SOURCES
src/editor/C4Console.cpp src/editor/C4Console.cpp
src/editor/C4Console.h src/editor/C4Console.h
src/editor/C4ConsoleGUI.h src/editor/C4ConsoleGUI.h
src/editor/C4ConsoleGUICommon.cpp src/editor/C4ConsoleGUICommon.h
src/editor/C4DevmodeDlg.cpp src/editor/C4DevmodeDlg.cpp
src/editor/C4DevmodeDlg.h src/editor/C4DevmodeDlg.h
src/editor/C4EditCursor.cpp src/editor/C4EditCursor.cpp

8
Makefile.am
View File

@ -219,6 +219,8 @@ src/control/C4Teams.cpp \
src/control/C4Teams.h \ src/control/C4Teams.h \
src/editor/C4Console.cpp \ src/editor/C4Console.cpp \
src/editor/C4Console.h \ src/editor/C4Console.h \
src/editor/C4ConsoleGUI.h \
src/editor/C4ConsoleGUICommon.h \
src/editor/C4DevmodeDlg.cpp \ src/editor/C4DevmodeDlg.cpp \
src/editor/C4DevmodeDlg.h \ src/editor/C4DevmodeDlg.h \
src/editor/C4EditCursor.cpp \ src/editor/C4EditCursor.cpp \
@ -438,6 +440,8 @@ src/platform/C4ViewportWindow.cpp \
src/platform/C4ViewportWindow.h \ src/platform/C4ViewportWindow.h \
src/platform/OpenURL.cpp \ src/platform/OpenURL.cpp \
src/platform/PlatformAbstraction.h \ src/platform/PlatformAbstraction.h \
src/platform/StdAppCommon.h \
src/platform/StdAppCommon.cpp \
src/platform/StdConfig.cpp \ src/platform/StdConfig.cpp \
src/platform/StdConfig.h \ src/platform/StdConfig.h \
src/platform/StdD3D.cpp \ src/platform/StdD3D.cpp \
@ -527,7 +531,7 @@ src/C4Version.h.in
##hgrevision.h ##hgrevision.h
if WIN32 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/res/engine.rc src/res/resource.h
clonk_SOURCES += src/platform/StdJoystick.cpp src/platform/StdJoystick.h clonk_SOURCES += src/platform/StdJoystick.cpp src/platform/StdJoystick.h
endif endif
@ -544,7 +548,7 @@ clonk_SOURCES += src/platform/StdXApp.cpp src/platform/StdXWindow.cpp src/platfo
endif endif
endif endif
if DEVELOPER_MODE 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 endif
clonk_LDADD = \ clonk_LDADD = \

3
src/editor/C4ConsoleGTK.cpp
View File

@ -1719,5 +1719,4 @@ void C4ToolsDlg::State::OnWindowHide(GtkWidget* widget, gpointer data)
static_cast<C4ToolsDlg::State*>(data)->GetOwner()->Active = false; static_cast<C4ToolsDlg::State*>(data)->GetOwner()->Active = false;
} }
#define CONSOLEGUICOMMONINCLUDE #include "C4ConsoleGUICommon.h"
#include "C4ConsoleGUICommon.cpp"

6
src/editor/C4ConsoleGUICommon.cpp → src/editor/C4ConsoleGUICommon.h
View File

@ -15,10 +15,6 @@
// To be directly included by platform-specific implementations // To be directly included by platform-specific implementations
#include <C4Include.h>
#ifdef CONSOLEGUICOMMONINCLUDE
C4ConsoleGUI::C4ConsoleGUI() C4ConsoleGUI::C4ConsoleGUI()
{ {
state = new C4ConsoleGUI::State(this); state = new C4ConsoleGUI::State(this);
@ -90,5 +86,3 @@ void C4PropertyDlg::Clear()
} }
const char *C4ConsoleGUI::LIST_DIVIDER = "divid0r"; const char *C4ConsoleGUI::LIST_DIVIDER = "divid0r";
#endif

3
src/editor/C4ConsoleWin32.cpp
View File

@ -1197,5 +1197,4 @@ void C4ConsoleGUI::ToolsDlgEnableControls(C4ToolsDlg *dlg)
EnableWindow(GetDlgItem(hDialog,IDC_PREVIEW),(iLandscapeMode>=C4LSC_Static)); EnableWindow(GetDlgItem(hDialog,IDC_PREVIEW),(iLandscapeMode>=C4LSC_Static));
} }
#define CONSOLEGUICOMMONINCLUDE #include "C4ConsoleGUICommon.h"
#include "C4ConsoleGUICommon.cpp"