From 1463d5e7dc8d3b065d2b54734651aa12909190b9 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 11 Jan 2015 05:35:47 +0100 Subject: [PATCH] Move message queue to libretro-sdk --- Makefile.common | 2 +- general.h | 2 +- griffin/griffin.c | 2 +- .../include/queues/message_queue.h | 35 +++++++++++-------- .../queues/message_queue.c | 2 +- menu/disp/rmenu_xui.cpp | 1 - netplay.c | 2 +- tools/retroarch-joyconfig-griffin.c | 2 +- 8 files changed, 26 insertions(+), 22 deletions(-) rename message_queue.h => libretro-sdk/include/queues/message_queue.h (51%) rename message_queue.c => libretro-sdk/queues/message_queue.c (99%) diff --git a/Makefile.common b/Makefile.common index 349aaf8ec6..567632830c 100644 --- a/Makefile.common +++ b/Makefile.common @@ -104,7 +104,7 @@ OBJ += frontend/frontend.o \ settings_data.o \ dynamic.o \ dynamic_dummy.o \ - message_queue.o \ + libretro-sdk/queues/message_queue.o \ rewind.o \ gfx/gfx_common.o \ gfx/fonts/bitmapfont.o \ diff --git a/general.h b/general.h index 5dddfb0c0f..5e71731ffb 100644 --- a/general.h +++ b/general.h @@ -22,7 +22,7 @@ #include #include #include "driver.h" -#include "message_queue.h" +#include #include "rewind.h" #include "movie.h" #include "autosave.h" diff --git a/griffin/griffin.c b/griffin/griffin.c index 1fdab314d9..34125cb53b 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -555,7 +555,7 @@ FILE /*============================================================ MESSAGE ============================================================ */ -#include "../message_queue.c" +#include "../libretro-sdk/queues/message_queue.c" /*============================================================ PATCH diff --git a/message_queue.h b/libretro-sdk/include/queues/message_queue.h similarity index 51% rename from message_queue.h rename to libretro-sdk/include/queues/message_queue.h index 3d7bc538e9..560bb488e7 100644 --- a/message_queue.h +++ b/libretro-sdk/include/queues/message_queue.h @@ -1,22 +1,27 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * Copyright (C) 2011-2015 - Daniel De Matteis - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. +/* Copyright (C) 2010-2015 The RetroArch team * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. + * --------------------------------------------------------------------------------------- + * The following license statement only applies to this file (boolean.h). + * --------------------------------------------------------------------------------------- * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . + * Permission is hereby granted, free of charge, + * to any person obtaining a copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - -#ifndef __RARCH_MSG_QUEUE_H -#define __RARCH_MSG_QUEUE_H +#ifndef __LIBRETRO_SDK_MSG_QUEUE_H +#define __LIBRETRO_SDK_MSG_QUEUE_H #include diff --git a/message_queue.c b/libretro-sdk/queues/message_queue.c similarity index 99% rename from message_queue.c rename to libretro-sdk/queues/message_queue.c index e3314934c5..18320ac70e 100644 --- a/message_queue.c +++ b/libretro-sdk/queues/message_queue.c @@ -17,7 +17,7 @@ #include #include #include -#include "message_queue.h" +#include #include struct queue_elem diff --git a/menu/disp/rmenu_xui.cpp b/menu/disp/rmenu_xui.cpp index 4b5a757af8..af187809df 100644 --- a/menu/disp/rmenu_xui.cpp +++ b/menu/disp/rmenu_xui.cpp @@ -28,7 +28,6 @@ #include "../../gfx/gfx_context.h" #include "../../settings_data.h" -#include "../../message_queue.h" #include "../../general.h" #include "../../gfx/d3d/d3d.h" diff --git a/netplay.c b/netplay.c index 0046722e47..e5b38ec62d 100644 --- a/netplay.c +++ b/netplay.c @@ -23,7 +23,7 @@ #include "general.h" #include "autosave.h" #include "dynamic.h" -#include "message_queue.h" +#include #include #include diff --git a/tools/retroarch-joyconfig-griffin.c b/tools/retroarch-joyconfig-griffin.c index 9f3e0f0e5f..1414ce7901 100644 --- a/tools/retroarch-joyconfig-griffin.c +++ b/tools/retroarch-joyconfig-griffin.c @@ -54,4 +54,4 @@ #include "../input/input_common.c" #include "../input/input_keymaps.c" -#include "../message_queue.c" +#include "../libretro-sdk/queues/message_queue.c"