ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Kill globals.h and move needed includes and defintion in main.cpp which was its only user.

This commit is contained in:
riccardom 2008-12-25 21:04:46 +00:00
parent f1c135e929
commit 9a07979ccf
2 changed files with 26 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
desmume/src/gtk/globals.h
View File

@ -1,48 +0,0 @@
/* globals.h - this file is part of DeSmuME
*
* Copyright (C) 2007 DeSmuME Team
*
* Author: Pascal Giard <evilynux@gmail.com>
*
* This file 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 Foundation; either version 2, or (at your option)
* any later version.
*
* This file 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.
*
* You should have received a copy of the GNU General Public License
* along with this program; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef GLOBALS_H
#define GLOBALS_H
#ifndef GTK_UI
#define GTK_UI
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <libgen.h>
#include <unistd.h>
#include <pthread.h>
#include <SDL.h>
#include "../MMU.h"
#include "../armcpu.h"
#include "../NDSSystem.h"
#include "../cflash.h"
#include "../sndsdl.h"
#include "../ctrlssdl.h"
#include "../types.h"
#include "../render3D.h"
#endif /* GLOBALS_H */

40
desmume/src/gtk/main.cpp
View File

@ -18,24 +18,36 @@
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef GTK_UI
#define GTK_UI
#endif
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <gtk/gtk.h>
#include <SDL.h>
#include "types.h"
#include "armcpu.h"
#include "NDSSystem.h"
#include "sndsdl.h"
#include "ctrlssdl.h"
#include "MMU.h"
#include "render3D.h"
#include "desmume.h"
#include "debug.h"
#ifdef GDB_STUB
#include "gdbstub.h"
#endif
#ifdef GTKGLEXT_AVAILABLE
#include <GL/gl.h>
#include <GL/glu.h>
#include <gtk/gtkgl.h>
#endif
#include <gtk/gtk.h>
#include "globals.h"
#include "desmume.h"
#include "../debug.h"
#ifdef GDB_STUB
#include "../gdbstub.h"
#endif
#ifdef GTKGLEXT_AVAILABLE
#include "../OGLRender.h"
#include "OGLRender.h"
#include "gdk_3Demu.h"
#endif