[Desmume-cvs] SF.net SVN: desmume:[1235] trunk/desmume/src/gtk

[<ric...@us...>]

Revision: 1235
          http://desmume.svn.sourceforge.net/desmume/?rev=1235&view=rev
Author:   riccardom
Date:     2008-12-25 21:04:46 +0000 (Thu, 25 Dec 2008)

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

Modified Paths:
--------------
    trunk/desmume/src/gtk/main.cpp

Removed Paths:
-------------
    trunk/desmume/src/gtk/globals.h

Deleted: trunk/desmume/src/gtk/globals.h
===================================================================
--- trunk/desmume/src/gtk/globals.h	2008-12-25 20:43:59 UTC (rev 1234)
+++ trunk/desmume/src/gtk/globals.h	2008-12-25 21:04:46 UTC (rev 1235)
@@ -1,48 +0,0 @@
-/* globals.h - this file is part of DeSmuME
- *
- * Copyright (C) 2007 DeSmuME Team
- *
- * Author: Pascal Giard <evi...@gm...>
- *
- * 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 */

Modified: trunk/desmume/src/gtk/main.cpp
===================================================================
--- trunk/desmume/src/gtk/main.cpp	2008-12-25 20:43:59 UTC (rev 1234)
+++ trunk/desmume/src/gtk/main.cpp	2008-12-25 21:04:46 UTC (rev 1235)
@@ -18,24 +18,36 @@
  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#ifdef GTKGLEXT_AVAILABLE
-#include <GL/gl.h>
-#include <GL/glu.h>
-#include <gtk/gtkgl.h>
+
+#ifndef GTK_UI
+#define GTK_UI
 #endif
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include <gtk/gtk.h>
+#include <SDL.h>
 
-#include "globals.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"
+#include "debug.h"
 
 #ifdef GDB_STUB
-#include "../gdbstub.h"
+#include "gdbstub.h"
 #endif
 
 #ifdef GTKGLEXT_AVAILABLE
-#include "../OGLRender.h"
+#include <GL/gl.h>
+#include <GL/glu.h>
+#include <gtk/gtkgl.h>
+#include "OGLRender.h"
 #include "gdk_3Demu.h"
 #endif
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.