From 2dbd84c7946c17d322a08dd5729db775c82326b6 Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Fri, 18 Jan 2019 15:55:40 +0100 Subject: [PATCH] debugger: CMake-ify --- debugger/CMakeLists.txt | 90 +++++++++++++++++++++ debugger/{debugger.h => debugger.hpp} | 0 debugger/debugger.rc | 6 +- debugger/debuggerapp.cpp | 10 +-- debugger/{debuggerapp.h => debuggerapp.hpp} | 2 +- debugger/debugtree.cpp | 8 +- debugger/{debugtree.h => debugtree.hpp} | 4 +- debugger/mainframe.cpp | 10 +-- debugger/{mainframe.h => mainframe.hpp} | 8 +- debugger/prefs.cpp | 6 +- debugger/{prefs.h => prefs.hpp} | 0 debugger/{resource.h => resource.hpp} | 0 debugger/resource.rc | 6 +- debugger/sourcefile.cpp | 6 +- debugger/{sourcefile.h => sourcefile.hpp} | 0 debugger/stdafx.cpp | 2 +- debugger/{stdafx.h => stdafx.hpp} | 0 debugger/stdutil.cpp | 2 +- debugger/tabber.cpp | 5 +- debugger/{tabber.h => tabber.hpp} | 0 20 files changed, 128 insertions(+), 37 deletions(-) create mode 100644 debugger/CMakeLists.txt rename debugger/{debugger.h => debugger.hpp} (100%) rename debugger/{debuggerapp.h => debuggerapp.hpp} (91%) rename debugger/{debugtree.h => debugtree.hpp} (94%) rename debugger/{mainframe.h => mainframe.hpp} (93%) rename debugger/{prefs.h => prefs.hpp} (100%) rename debugger/{resource.h => resource.hpp} (100%) rename debugger/{sourcefile.h => sourcefile.hpp} (100%) rename debugger/{stdafx.h => stdafx.hpp} (100%) rename debugger/{tabber.h => tabber.hpp} (100%) diff --git a/debugger/CMakeLists.txt b/debugger/CMakeLists.txt new file mode 100644 index 0000000..d09c622 --- /dev/null +++ b/debugger/CMakeLists.txt @@ -0,0 +1,90 @@ +project(debugger) + +add_library(${PROJECT_NAME} MODULE + "debuggerapp.cpp" + "debuggerapp.hpp" + "debugtree.cpp" + "debugtree.hpp" + "mainframe.cpp" + "mainframe.hpp" + "prefs.cpp" + "prefs.hpp" + "sourcefile.cpp" + "sourcefile.hpp" + "stdafx.cpp" + "stdafx.hpp" + "stdutil.cpp" + "tabber.cpp" + "tabber.hpp" + "debugger.hpp" + "debugger.rc" + "resource.hpp" + "resource.rc" +) + +target_link_libraries(${PROJECT_NAME} + PRIVATE + linker + compiler + runtime_lib +) + +target_compile_definitions(${PROJECT_NAME} + PRIVATE + _AFXDLL +) + +target_include_directories(${PROJECT_NAME} + PUBLIC + ${PROJECT_SOURCE_DIR} +) + +if (WIN32) + target_compile_definitions(${PROJECT_NAME} + PRIVATE + _CRT_SECURE_NO_WARNINGS + # windows.h + WIN32_LEAN_AND_MEAN + NOGPICAPMASKS + NOVIRTUALKEYCODES + #NOWINMESSAGES + NOWINSTYLES + NOSYSMETRICS + NOMENUS + NOICONS + NOKEYSTATES + NOSYSCOMMANDS + NORASTEROPS + NOSHOWWINDOW + NOATOM + NOCLIPBOARD + NOCOLOR + NOCTLMGR + NODRAWTEXT + #NOGDI + NOKERNEL + #NOUSER + #NONLS + NOMB + NOMEMMGR + NOMETAFILE + NOMINMAX + #NOMSG + NOOPENFILE + NOSCROLL + NOSERVICE + NOSOUND + #NOTEXTMETRIC + NOWH + NOWINOFFSETS + NOCOMM + NOKANJI + #NOHELP + NOPROFILER + NODEFERWINDOWPOS + NOMCX + NOIME + NOMDI + NOINOUT + ) +endif() diff --git a/debugger/debugger.h b/debugger/debugger.hpp similarity index 100% rename from debugger/debugger.h rename to debugger/debugger.hpp diff --git a/debugger/debugger.rc b/debugger/debugger.rc index 33502e5..5280424 100644 --- a/debugger/debugger.rc +++ b/debugger/debugger.rc @@ -1,13 +1,13 @@ //Microsoft Developer Studio generated resource script. // -#include "resource.h" +#include "resource.hpp" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "afxres.hpp" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +34,7 @@ END 2 TEXTINCLUDE DISCARDABLE BEGIN - "#include ""afxres.h""\r\n" + "#include ""afxres.hpp""\r\n" "\0" END diff --git a/debugger/debuggerapp.cpp b/debugger/debuggerapp.cpp index 917a1d5..3e212f2 100644 --- a/debugger/debuggerapp.cpp +++ b/debugger/debuggerapp.cpp @@ -1,9 +1,9 @@ -#include "stdafx.h" -#include "debugger.h" -#include "debuggerapp.h" -#include "resource.h" -#include "prefs.h" +#include "stdafx.hpp" +#include "debugger.hpp" +#include "debuggerapp.hpp" +#include "resource.hpp" +#include "prefs.hpp" DebuggerApp debuggerApp; diff --git a/debugger/debuggerapp.h b/debugger/debuggerapp.hpp similarity index 91% rename from debugger/debuggerapp.h rename to debugger/debuggerapp.hpp index 6ca090e..626f0d6 100644 --- a/debugger/debuggerapp.h +++ b/debugger/debuggerapp.hpp @@ -2,7 +2,7 @@ #ifndef DEBUGGERAPP_H #define DEBUGGERAPP_H -#include "mainframe.h" +#include "mainframe.hpp" class DebuggerApp : public CWinApp{ MainFrame *main_frame; diff --git a/debugger/debugtree.cpp b/debugger/debugtree.cpp index ad913ca..5d4ce66 100644 --- a/debugger/debugtree.cpp +++ b/debugger/debugtree.cpp @@ -1,9 +1,9 @@ -#include "stdafx.h" -#include "debugtree.h" -#include "prefs.h" +#include "stdafx.hpp" +#include "debugtree.hpp" +#include "prefs.hpp" -#include "../RuntimeLib/basic.h" +//#include "basic.hpp" IMPLEMENT_DYNAMIC( DebugTree,CTreeCtrl ) BEGIN_MESSAGE_MAP( DebugTree,CTreeCtrl ) diff --git a/debugger/debugtree.h b/debugger/debugtree.hpp similarity index 94% rename from debugger/debugtree.h rename to debugger/debugtree.hpp index cd06047..452f344 100644 --- a/debugger/debugtree.h +++ b/debugger/debugtree.hpp @@ -2,8 +2,8 @@ #ifndef DEBUGTREE_H #define DEBUGTREE_H -#include "../LinkerLib/linker.h" -#include "../Compiler/environ.h" +#include "linker.hpp" +#include "environ.hpp" class DebugTree : public CTreeCtrl{ int st_nest; diff --git a/debugger/mainframe.cpp b/debugger/mainframe.cpp index 77bbc3c..25547b4 100644 --- a/debugger/mainframe.cpp +++ b/debugger/mainframe.cpp @@ -1,9 +1,9 @@ -#include "stdafx.h" -#include "mainframe.h" -#include "resource.h" -#include "debuggerapp.h" -#include "prefs.h" +#include "stdafx.hpp" +#include "mainframe.hpp" +#include "resource.hpp" +#include "debuggerapp.hpp" +#include "prefs.hpp" #define WM_IDLEUPDATECMDUI 0x0363 // wParam == bDisableIfNoHandler diff --git a/debugger/mainframe.h b/debugger/mainframe.hpp similarity index 93% rename from debugger/mainframe.h rename to debugger/mainframe.hpp index 150b7c7..bd642d7 100644 --- a/debugger/mainframe.h +++ b/debugger/mainframe.hpp @@ -2,10 +2,10 @@ #ifndef MAINFRAME_H #define MAINFRAME_H -#include "tabber.h" -#include "debugger.h" -#include "sourcefile.h" -#include "debugtree.h" +#include "tabber.hpp" +#include "debugger.hpp" +#include "sourcefile.hpp" +#include "debugtree.hpp" class MainFrame : public CFrameWnd,public Debugger{ diff --git a/debugger/prefs.cpp b/debugger/prefs.cpp index 74d985f..1ea406c 100644 --- a/debugger/prefs.cpp +++ b/debugger/prefs.cpp @@ -1,7 +1,7 @@ -#include "stdafx.h" -#include "prefs.h" -#include "debuggerapp.h" +#include "stdafx.hpp" +#include "prefs.hpp" +#include "debuggerapp.hpp" #include #define SWAPRB(x) ( (((x)>>16)&0xff) | ((x)&0xff00) | (((x)&0xff)<<16) ) diff --git a/debugger/prefs.h b/debugger/prefs.hpp similarity index 100% rename from debugger/prefs.h rename to debugger/prefs.hpp diff --git a/debugger/resource.h b/debugger/resource.hpp similarity index 100% rename from debugger/resource.h rename to debugger/resource.hpp diff --git a/debugger/resource.rc b/debugger/resource.rc index 33502e5..5280424 100644 --- a/debugger/resource.rc +++ b/debugger/resource.rc @@ -1,13 +1,13 @@ //Microsoft Developer Studio generated resource script. // -#include "resource.h" +#include "resource.hpp" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "afxres.hpp" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +34,7 @@ END 2 TEXTINCLUDE DISCARDABLE BEGIN - "#include ""afxres.h""\r\n" + "#include ""afxres.hpp""\r\n" "\0" END diff --git a/debugger/sourcefile.cpp b/debugger/sourcefile.cpp index 89ee238..e7a61c3 100644 --- a/debugger/sourcefile.cpp +++ b/debugger/sourcefile.cpp @@ -1,7 +1,7 @@ -#include "stdafx.h" -#include "sourcefile.h" -#include "prefs.h" +#include "stdafx.hpp" +#include "sourcefile.hpp" +#include "prefs.hpp" IMPLEMENT_DYNAMIC( SourceFile,CRichEditCtrl ) BEGIN_MESSAGE_MAP( SourceFile,CRichEditCtrl ) diff --git a/debugger/sourcefile.h b/debugger/sourcefile.hpp similarity index 100% rename from debugger/sourcefile.h rename to debugger/sourcefile.hpp diff --git a/debugger/stdafx.cpp b/debugger/stdafx.cpp index 46cd188..b2c2009 100644 --- a/debugger/stdafx.cpp +++ b/debugger/stdafx.cpp @@ -1,2 +1,2 @@ -#include "stdafx.h" +#include "stdafx.hpp" diff --git a/debugger/stdafx.h b/debugger/stdafx.hpp similarity index 100% rename from debugger/stdafx.h rename to debugger/stdafx.hpp diff --git a/debugger/stdutil.cpp b/debugger/stdutil.cpp index d191131..d394747 100644 --- a/debugger/stdutil.cpp +++ b/debugger/stdutil.cpp @@ -1,5 +1,5 @@ -#include "stdafx.h" +#include "stdafx.hpp" int atoi( const string &s ){ return atoi( s.c_str() ); diff --git a/debugger/tabber.cpp b/debugger/tabber.cpp index 28ad232..df599dd 100644 --- a/debugger/tabber.cpp +++ b/debugger/tabber.cpp @@ -1,6 +1,7 @@ -#include "stdafx.h" -#include "tabber.h" +#include "stdafx.hpp" +#include "tabber.hpp" +#include IMPLEMENT_DYNAMIC( Tabber,CTabCtrl ) BEGIN_MESSAGE_MAP( Tabber,CTabCtrl ) diff --git a/debugger/tabber.h b/debugger/tabber.hpp similarity index 100% rename from debugger/tabber.h rename to debugger/tabber.hpp