From 999ca92aa9ee10585c0b2094d84364159253982f Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Thu, 6 Mar 2008 12:54:18 +0000 Subject: [PATCH] Reorganize files to separate gbase and input --- Build | 16 ++++++++++++++-- source/{ => gbase}/display.cpp | 0 source/{ => gbase}/display.h | 0 source/{ => gbase}/drawcontext.cpp | 0 source/{ => gbase}/drawcontext.h | 0 source/{ => gbase}/glcontext.cpp | 0 source/{ => gbase}/glcontext.h | 0 source/{ => gbase}/types.h | 0 source/{ => gbase}/window.cpp | 0 source/{ => gbase}/window.h | 0 source/{ => input}/binarycontrol.cpp | 2 +- source/{ => input}/binarycontrol.h | 0 source/{ => input}/control.cpp | 2 +- source/{ => input}/control.h | 0 source/{inputdevice.cpp => input/device.cpp} | 2 +- source/{inputdevice.h => input/device.h} | 0 source/{inputhub.cpp => input/hub.cpp} | 2 +- source/{inputhub.h => input/hub.h} | 2 +- source/{ => input}/keyboard.cpp | 2 +- source/{ => input}/keyboard.h | 4 ++-- source/{ => input}/mouse.cpp | 0 source/{ => input}/mouse.h | 4 ++-- source/{ => input}/smoothcontrol.cpp | 0 source/{ => input}/smoothcontrol.h | 0 24 files changed, 24 insertions(+), 12 deletions(-) rename source/{ => gbase}/display.cpp (100%) rename source/{ => gbase}/display.h (100%) rename source/{ => gbase}/drawcontext.cpp (100%) rename source/{ => gbase}/drawcontext.h (100%) rename source/{ => gbase}/glcontext.cpp (100%) rename source/{ => gbase}/glcontext.h (100%) rename source/{ => gbase}/types.h (100%) rename source/{ => gbase}/window.cpp (100%) rename source/{ => gbase}/window.h (100%) rename source/{ => input}/binarycontrol.cpp (96%) rename source/{ => input}/binarycontrol.h (100%) rename source/{ => input}/control.cpp (99%) rename source/{ => input}/control.h (100%) rename source/{inputdevice.cpp => input/device.cpp} (97%) rename source/{inputdevice.h => input/device.h} (100%) rename source/{inputhub.cpp => input/hub.cpp} (98%) rename source/{inputhub.h => input/hub.h} (97%) rename source/{ => input}/keyboard.cpp (97%) rename source/{ => input}/keyboard.h (91%) rename source/{ => input}/mouse.cpp (100%) rename source/{ => input}/mouse.h (92%) rename source/{ => input}/smoothcontrol.cpp (100%) rename source/{ => input}/smoothcontrol.h (100%) diff --git a/Build b/Build index 3386119..17a6fdc 100644 --- a/Build +++ b/Build @@ -27,10 +27,22 @@ package "mspgbase" }; }; + headers "gbase" + { + source "source/gbase"; + install_headers "msp/gbase"; + }; + + headers "input" + { + source "source/input"; + install_headers "msp/input"; + }; + library "mspgbase" { - source "source"; + source "source/gbase"; + source "source/input"; install true; - install_headers "msp/gbase"; }; }; diff --git a/source/display.cpp b/source/gbase/display.cpp similarity index 100% rename from source/display.cpp rename to source/gbase/display.cpp diff --git a/source/display.h b/source/gbase/display.h similarity index 100% rename from source/display.h rename to source/gbase/display.h diff --git a/source/drawcontext.cpp b/source/gbase/drawcontext.cpp similarity index 100% rename from source/drawcontext.cpp rename to source/gbase/drawcontext.cpp diff --git a/source/drawcontext.h b/source/gbase/drawcontext.h similarity index 100% rename from source/drawcontext.h rename to source/gbase/drawcontext.h diff --git a/source/glcontext.cpp b/source/gbase/glcontext.cpp similarity index 100% rename from source/glcontext.cpp rename to source/gbase/glcontext.cpp diff --git a/source/glcontext.h b/source/gbase/glcontext.h similarity index 100% rename from source/glcontext.h rename to source/gbase/glcontext.h diff --git a/source/types.h b/source/gbase/types.h similarity index 100% rename from source/types.h rename to source/gbase/types.h diff --git a/source/window.cpp b/source/gbase/window.cpp similarity index 100% rename from source/window.cpp rename to source/gbase/window.cpp diff --git a/source/window.h b/source/gbase/window.h similarity index 100% rename from source/window.h rename to source/gbase/window.h diff --git a/source/binarycontrol.cpp b/source/input/binarycontrol.cpp similarity index 96% rename from source/binarycontrol.cpp rename to source/input/binarycontrol.cpp index daafd95..9bf2408 100644 --- a/source/binarycontrol.cpp +++ b/source/input/binarycontrol.cpp @@ -6,7 +6,7 @@ Distributed under the LGPL */ #include "binarycontrol.h" -#include "inputdevice.h" +#include "device.h" namespace Msp { namespace Input { diff --git a/source/binarycontrol.h b/source/input/binarycontrol.h similarity index 100% rename from source/binarycontrol.h rename to source/input/binarycontrol.h diff --git a/source/control.cpp b/source/input/control.cpp similarity index 99% rename from source/control.cpp rename to source/input/control.cpp index 823202d..8ddcdd7 100644 --- a/source/control.cpp +++ b/source/input/control.cpp @@ -8,7 +8,7 @@ Distributed under the LGPL #include #include #include "control.h" -#include "inputdevice.h" +#include "device.h" namespace Msp { namespace Input { diff --git a/source/control.h b/source/input/control.h similarity index 100% rename from source/control.h rename to source/input/control.h diff --git a/source/inputdevice.cpp b/source/input/device.cpp similarity index 97% rename from source/inputdevice.cpp rename to source/input/device.cpp index f3092e1..23393de 100644 --- a/source/inputdevice.cpp +++ b/source/input/device.cpp @@ -6,7 +6,7 @@ Distributed under the LGPL */ #include -#include "inputdevice.h" +#include "device.h" namespace Msp { namespace Input { diff --git a/source/inputdevice.h b/source/input/device.h similarity index 100% rename from source/inputdevice.h rename to source/input/device.h diff --git a/source/inputhub.cpp b/source/input/hub.cpp similarity index 98% rename from source/inputhub.cpp rename to source/input/hub.cpp index 1fa95d0..51b9717 100644 --- a/source/inputhub.cpp +++ b/source/input/hub.cpp @@ -7,7 +7,7 @@ Distributed under the LGPL #include #include -#include "inputhub.h" +#include "hub.h" namespace Msp { namespace Input { diff --git a/source/inputhub.h b/source/input/hub.h similarity index 97% rename from source/inputhub.h rename to source/input/hub.h index c66ae98..4385f27 100644 --- a/source/inputhub.h +++ b/source/input/hub.h @@ -8,7 +8,7 @@ Distributed under the LGPL #ifndef MSP_GBASE_INPUTHUB_H_ #define MSP_GBASE_INPUTHUB_H_ -#include "inputdevice.h" +#include "device.h" namespace Msp { namespace Input { diff --git a/source/keyboard.cpp b/source/input/keyboard.cpp similarity index 97% rename from source/keyboard.cpp rename to source/input/keyboard.cpp index 2e3c92d..240d700 100644 --- a/source/keyboard.cpp +++ b/source/input/keyboard.cpp @@ -6,7 +6,7 @@ Distributed under the LGPL */ #include -#include "display.h" +#include "../gbase/display.h" #include "keyboard.h" namespace Msp { diff --git a/source/keyboard.h b/source/input/keyboard.h similarity index 91% rename from source/keyboard.h rename to source/input/keyboard.h index 3e0efa2..54479ea 100644 --- a/source/keyboard.h +++ b/source/input/keyboard.h @@ -8,8 +8,8 @@ Distributed under the LGPL #ifndef MSP_GBASE_KEYBOARD_H_ #define MSP_GBASE_KEYBOARD_H_ -#include "inputdevice.h" -#include "window.h" +#include "device.h" +#include "../gbase/window.h" namespace Msp { namespace Input { diff --git a/source/mouse.cpp b/source/input/mouse.cpp similarity index 100% rename from source/mouse.cpp rename to source/input/mouse.cpp diff --git a/source/mouse.h b/source/input/mouse.h similarity index 92% rename from source/mouse.h rename to source/input/mouse.h index ccc2e8e..8d5086f 100644 --- a/source/mouse.h +++ b/source/input/mouse.h @@ -8,8 +8,8 @@ Distributed under the LGPL #ifndef MSP_GBASE_MOUSE_H_ #define MSP_GBASE_MOUSE_H_ -#include "inputdevice.h" -#include "window.h" +#include "device.h" +#include "../gbase/window.h" namespace Msp { namespace Input { diff --git a/source/smoothcontrol.cpp b/source/input/smoothcontrol.cpp similarity index 100% rename from source/smoothcontrol.cpp rename to source/input/smoothcontrol.cpp diff --git a/source/smoothcontrol.h b/source/input/smoothcontrol.h similarity index 100% rename from source/smoothcontrol.h rename to source/input/smoothcontrol.h -- 2.43.0