From ab97e26efcbe8f27559ab03329f57d5a19c56d0c Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Fri, 16 Oct 2015 18:31:14 -0400 Subject: [PATCH] Moved all the common stuff in a new folder common/. This is part of the makefile simplification. --- areaevents.c => common/areaevents.c | 2 +- control.c => common/control.c | 2 +- matrix.c => common/matrix.c | 2 +- menu.c => common/menu.c | 2 +- ptrarray.c => common/ptrarray.c | 2 +- shouldquit.c => common/shouldquit.c | 2 +- types.c => common/types.c | 2 +- uipriv.h => common/uipriv.h | 0 {uthash => common/uthash}/LICENSE | 0 {uthash => common/uthash}/utarray.h | 0 {uthash => common/uthash}/uthash.h | 0 {uthash => common/uthash}/utlist.h | 0 {uthash => common/uthash}/utstring.h | 0 darwin/uipriv_darwin.h | 2 +- unix/uipriv_unix.h | 2 +- windows/uipriv_windows.h | 2 +- 16 files changed, 10 insertions(+), 10 deletions(-) rename areaevents.c => common/areaevents.c (99%) rename control.c => common/control.c (99%) rename matrix.c => common/matrix.c (99%) rename menu.c => common/menu.c (94%) rename ptrarray.c => common/ptrarray.c (98%) rename shouldquit.c => common/shouldquit.c (94%) rename types.c => common/types.c (99%) rename uipriv.h => common/uipriv.h (100%) rename {uthash => common/uthash}/LICENSE (100%) rename {uthash => common/uthash}/utarray.h (100%) rename {uthash => common/uthash}/uthash.h (100%) rename {uthash => common/uthash}/utlist.h (100%) rename {uthash => common/uthash}/utstring.h (100%) diff --git a/areaevents.c b/common/areaevents.c similarity index 99% rename from areaevents.c rename to common/areaevents.c index 0f42bc6f..c4abf102 100644 --- a/areaevents.c +++ b/common/areaevents.c @@ -1,5 +1,5 @@ // 29 march 2014 -#include "ui.h" +#include "../ui.h" #include "uipriv.h" /* diff --git a/control.c b/common/control.c similarity index 99% rename from control.c rename to common/control.c index d0fda2fd..241f0db4 100644 --- a/control.c +++ b/common/control.c @@ -1,5 +1,5 @@ // 26 may 2015 -#include "ui.h" +#include "../ui.h" #include "uipriv.h" struct controlBase { diff --git a/matrix.c b/common/matrix.c similarity index 99% rename from matrix.c rename to common/matrix.c index 94477cc8..7af2eb07 100644 --- a/matrix.c +++ b/common/matrix.c @@ -1,6 +1,6 @@ // 11 october 2015 #include -#include "ui.h" +#include "../ui.h" #include "uipriv.h" void setIdentity(uiDrawMatrix *m) diff --git a/menu.c b/common/menu.c similarity index 94% rename from menu.c rename to common/menu.c index cc216cb7..b9ccfedb 100644 --- a/menu.c +++ b/common/menu.c @@ -1,5 +1,5 @@ // 29 may 2015 -#include "ui.h" +#include "../ui.h" static uintmax_t type_uiMenu = 0; static uintmax_t type_uiMenuItem = 0; diff --git a/ptrarray.c b/common/ptrarray.c similarity index 98% rename from ptrarray.c rename to common/ptrarray.c index 45d36f67..ac6dd165 100644 --- a/ptrarray.c +++ b/common/ptrarray.c @@ -1,6 +1,6 @@ // 5 may 2015 #include -#include "ui.h" +#include "../ui.h" #include "uipriv.h" struct ptrArray *newPtrArray(void) diff --git a/shouldquit.c b/common/shouldquit.c similarity index 94% rename from shouldquit.c rename to common/shouldquit.c index 27805df8..4e7aa5c3 100644 --- a/shouldquit.c +++ b/common/shouldquit.c @@ -1,5 +1,5 @@ // 9 may 2015 -#include "ui.h" +#include "../ui.h" #include "uipriv.h" static int defaultOnShouldQuit(void *data) diff --git a/types.c b/common/types.c similarity index 99% rename from types.c rename to common/types.c index 62fe1543..d99b50d3 100644 --- a/types.c +++ b/common/types.c @@ -1,5 +1,5 @@ // 17 may 2015 -#include "ui.h" +#include "../ui.h" #include "uipriv.h" struct typeinfo { diff --git a/uipriv.h b/common/uipriv.h similarity index 100% rename from uipriv.h rename to common/uipriv.h diff --git a/uthash/LICENSE b/common/uthash/LICENSE similarity index 100% rename from uthash/LICENSE rename to common/uthash/LICENSE diff --git a/uthash/utarray.h b/common/uthash/utarray.h similarity index 100% rename from uthash/utarray.h rename to common/uthash/utarray.h diff --git a/uthash/uthash.h b/common/uthash/uthash.h similarity index 100% rename from uthash/uthash.h rename to common/uthash/uthash.h diff --git a/uthash/utlist.h b/common/uthash/utlist.h similarity index 100% rename from uthash/utlist.h rename to common/uthash/utlist.h diff --git a/uthash/utstring.h b/common/uthash/utstring.h similarity index 100% rename from uthash/utstring.h rename to common/uthash/utstring.h diff --git a/darwin/uipriv_darwin.h b/darwin/uipriv_darwin.h index 81e21d1e..b2f27ced 100644 --- a/darwin/uipriv_darwin.h +++ b/darwin/uipriv_darwin.h @@ -4,7 +4,7 @@ #import #import "../ui.h" #import "../ui_darwin.h" -#import "../uipriv.h" +#import "../common/uipriv.h" #define toNSString(str) [NSString stringWithUTF8String:(str)] #define fromNSString(str) [(str) UTF8String] diff --git a/unix/uipriv_unix.h b/unix/uipriv_unix.h index 72b73e8a..5355787b 100644 --- a/unix/uipriv_unix.h +++ b/unix/uipriv_unix.h @@ -9,7 +9,7 @@ #include #include "../ui.h" #include "../ui_unix.h" -#include "../uipriv.h" +#include "../common/uipriv.h" #define gtkXMargin 12 #define gtkYMargin 12 diff --git a/windows/uipriv_windows.h b/windows/uipriv_windows.h index f6070763..a838e83f 100644 --- a/windows/uipriv_windows.h +++ b/windows/uipriv_windows.h @@ -2,7 +2,7 @@ #include "winapi.h" #include "../ui.h" #include "../ui_windows.h" -#include "../uipriv.h" +#include "../common/uipriv.h" #include "resources.h" #include "compilerver.h"