printscreen add

2006-04-18 16:41:34 +00:00 · 2006-04-18 16:41:34 +00:00 · 7b1695388b
parent 86979e44a7
commit 7b1695388b
14 changed files with 2870 additions and 508 deletions
--- a/desmume/src/build.bat
+++ b/desmume/src/build.bat
@ -0,0 +1,4 @@
+configure
+make clean
+make
+pause
--- a/desmume/src/gtk/dev-cpp/Makefile.win
+++ b/desmume/src/gtk/dev-cpp/Makefile.win
@ -0,0 +1,63 @@
+# Project: desmume
+# Makefile created by Dev-C++ 4.9.9.2
+
+CPP  = g++.exe
+CC   = gcc.exe
+WINDRES = windres.exe
+RES  = 
+OBJ  = ../main.o ../../arm_instructions.o ../../bios.o ../../cp15.o ../../Disassembler.o ../../GPU.o ../../MMU.o ../../NDSSystem.o ../../thumb_instructions.o ../../armcpu.o ../../debug.o ../../FIFO.o $(RES)
+LINKOBJ  = ../main.o ../../arm_instructions.o ../../bios.o ../../cp15.o ../../Disassembler.o ../../GPU.o ../../MMU.o ../../NDSSystem.o ../../thumb_instructions.o ../../armcpu.o ../../debug.o ../../FIFO.o $(RES)
+LIBS =  -L"lib" -mwindows -limm32 -lshell32 -lole32 -luuid -lintl -lpangowin32-1.0.dll -latk-1.0.dll -lgdk_pixbuf-2.0.dll -lgdk-win32-2.0.dll -lglib-2.0.dll -lgmodule-2.0.dll -lgobject-2.0.dll -lgthread-2.0.dll -lgtk-win32-2.0.dll -lpango-1.0.dll libpthreadGC2.a libSDL.a  
+INCS =  -I"include" 
+CXXINCS =  -I"lib/gcc/mingw32/3.4.2/include"  -I"include/c++/3.4.2/backward"  -I"include/c++/3.4.2/mingw32"  -I"include/c++/3.4.2"  -I"include" 
+BIN  = desmume.exe
+CXXFLAGS = $(CXXINCS) -I"C:\Dev-Cpp\\include\gtk-2.0" -I"C:\Dev-Cpp\\lib\gtk-2.0\include" -I"C:\Dev-Cpp\\include\atk-1.0" -I"C:\Dev-Cpp\\include\pango-1.0" -I"C:\Dev-Cpp\\include\glib-2.0" -I"C:\Dev-Cpp\\include\glib-2.0\glib" -I"C:\Dev-Cpp\\lib\glib-2.0" -I"C:\Dev-Cpp\\lib\glib-2.0\include" -mno-cygwin -mms-bitfields -mconsole  
+CFLAGS = $(INCS) -I"C:\Dev-Cpp\\include\gtk-2.0" -I"C:\Dev-Cpp\\lib\gtk-2.0\include" -I"C:\Dev-Cpp\\include\atk-1.0" -I"C:\Dev-Cpp\\include\pango-1.0" -I"C:\Dev-Cpp\\include\glib-2.0" -I"C:\Dev-Cpp\\include\glib-2.0\glib" -I"C:\Dev-Cpp\\lib\glib-2.0" -I"C:\Dev-Cpp\\lib\glib-2.0\include" -mno-cygwin -mms-bitfields  
+RM = rm -f
+
+.PHONY: all all-before all-after clean clean-custom
+
+all: all-before desmume.exe all-after
+
+
+clean: clean-custom
+	${RM} $(OBJ) $(BIN)
+
+$(BIN): $(OBJ)
+	$(CPP) $(LINKOBJ) -o "desmume.exe" $(LIBS)
+
+../main.o: ../main.cpp
+	$(CPP) -c ../main.cpp -o ../main.o $(CXXFLAGS)
+
+../../arm_instructions.o: ../../arm_instructions.cpp
+	$(CPP) -c ../../arm_instructions.cpp -o ../../arm_instructions.o $(CXXFLAGS)
+
+../../bios.o: ../../bios.cpp
+	$(CPP) -c ../../bios.cpp -o ../../bios.o $(CXXFLAGS)
+
+../../cp15.o: ../../cp15.cpp
+	$(CPP) -c ../../cp15.cpp -o ../../cp15.o $(CXXFLAGS)
+
+../../Disassembler.o: ../../Disassembler.cpp
+	$(CPP) -c ../../Disassembler.cpp -o ../../Disassembler.o $(CXXFLAGS)
+
+../../GPU.o: ../../GPU.cpp
+	$(CPP) -c ../../GPU.cpp -o ../../GPU.o $(CXXFLAGS)
+
+../../MMU.o: ../../MMU.cpp
+	$(CPP) -c ../../MMU.cpp -o ../../MMU.o $(CXXFLAGS)
+
+../../NDSSystem.o: ../../NDSSystem.cpp
+	$(CPP) -c ../../NDSSystem.cpp -o ../../NDSSystem.o $(CXXFLAGS)
+
+../../thumb_instructions.o: ../../thumb_instructions.cpp
+	$(CPP) -c ../../thumb_instructions.cpp -o ../../thumb_instructions.o $(CXXFLAGS)
+
+../../armcpu.o: ../../armcpu.cpp
+	$(CPP) -c ../../armcpu.cpp -o ../../armcpu.o $(CXXFLAGS)
+
+../../debug.o: ../../debug.c
+	$(CPP) -c ../../debug.c -o ../../debug.o $(CXXFLAGS)
+
+../../FIFO.o: ../../FIFO.cpp
+	$(CPP) -c ../../FIFO.cpp -o ../../FIFO.o $(CXXFLAGS)
--- a/desmume/src/gtk/dev-cpp/desmume.dev
+++ b/desmume/src/gtk/dev-cpp/desmume.dev
@ -0,0 +1,309 @@
+[Project]
+FileName=desmume.dev
+Name=desmume
+UnitCount=26
+Type=0
+Ver=1
+ObjFiles=
+Includes=
+Libs=
+PrivateResource=
+ResourceIncludes=
+MakeIncludes=
+Compiler=-I"<INCLUDE>\gtk-2.0" -I"<LIB>\gtk-2.0\include" -I"<INCLUDE>\atk-1.0" -I"<INCLUDE>\pango-1.0" -I"<INCLUDE>\glib-2.0" -I"<INCLUDE>\glib-2.0\glib" -I"<LIB>\glib-2.0" -I"<LIB>\glib-2.0\include" -mno-cygwin -mms-bitfields_@@_
+CppCompiler=-I"<INCLUDE>\gtk-2.0" -I"<LIB>\gtk-2.0\include" -I"<INCLUDE>\atk-1.0" -I"<INCLUDE>\pango-1.0" -I"<INCLUDE>\glib-2.0" -I"<INCLUDE>\glib-2.0\glib" -I"<LIB>\glib-2.0" -I"<LIB>\glib-2.0\include" -mno-cygwin -mms-bitfields -mconsole_@@_
+Linker=-limm32 -lshell32 -lole32 -luuid -lintl -lpangowin32-1.0.dll -latk-1.0.dll -lgdk_pixbuf-2.0.dll -lgdk-win32-2.0.dll -lglib-2.0.dll -lgmodule-2.0.dll -lgobject-2.0.dll -lgthread-2.0.dll -lgtk-win32-2.0.dll -lpango-1.0.dll_@@_libpthreadGC2.a_@@_libSDL.a_@@_
+IsCpp=1
+Icon=
+ExeOutput=
+ObjectOutput=
+OverrideOutput=0
+OverrideOutputName=desmume.exe
+HostApplication=
+Folders=
+CommandLine=
+UseCustomMakefile=0
+CustomMakefile=
+IncludeVersionInfo=0
+SupportXPThemes=0
+CompilerSet=0
+CompilerSettings=0000000000000000000000
+
+[Unit1]
+FileName=..\main.cpp
+CompileCpp=1
+Folder=desmume
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit2]
+FileName=..\..\types.h
+CompileCpp=1
+Folder=desmume
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit3]
+FileName=..\..\arm_instructions.cpp
+CompileCpp=1
+Folder=desmume
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit4]
+FileName=..\..\arm_instructions.h
+CompileCpp=1
+Folder=desmume
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit7]
+FileName=..\..\bios.hpp
+CompileCpp=1
+Folder=desmume
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit8]
+FileName=..\..\config.h
+CompileCpp=1
+Folder=desmume
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit9]
+FileName=..\..\cp15.cpp
+CompileCpp=1
+Folder=desmume
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit10]
+FileName=..\..\cp15.h
+CompileCpp=1
+Folder=desmume
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit11]
+FileName=..\..\Disassembler.cpp
+CompileCpp=1
+Folder=desmume
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit12]
+FileName=..\..\Disassembler.hpp
+CompileCpp=1
+Folder=desmume
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit13]
+FileName=..\..\FIFO.hpp
+CompileCpp=1
+Folder=desmume
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit14]
+FileName=..\..\GPU.cpp
+CompileCpp=1
+Folder=desmume
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit15]
+FileName=..\..\GPU.hpp
+CompileCpp=1
+Folder=desmume
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit16]
+FileName=..\..\MMU.cpp
+CompileCpp=1
+Folder=desmume
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit17]
+FileName=..\..\MMU.hpp
+CompileCpp=1
+Folder=desmume
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit18]
+FileName=..\..\NDSSystem.cpp
+CompileCpp=1
+Folder=desmume
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit19]
+FileName=..\..\NDSSystem.hpp
+CompileCpp=1
+Folder=desmume
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit20]
+FileName=..\..\thumb_instructions.cpp
+CompileCpp=1
+Folder=desmume
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit21]
+FileName=..\..\thumb_instructions.h
+CompileCpp=1
+Folder=desmume
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit22]
+FileName=pthread.h
+CompileCpp=1
+Folder=desmume
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit23]
+FileName=..\..\armcpu.cpp
+CompileCpp=1
+Folder=desmume
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit24]
+FileName=..\..\debug.c
+CompileCpp=1
+Folder=desmume
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit25]
+FileName=..\..\debug.h
+CompileCpp=1
+Folder=desmume
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit26]
+FileName=..\..\FIFO.cpp
+CompileCpp=1
+Folder=desmume
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[VersionInfo]
+Major=0
+Minor=1
+Release=1
+Build=1
+LanguageID=1033
+CharsetID=1252
+CompanyName=
+FileVersion=
+FileDescription=Developed using the Dev-C++ IDE
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=
+AutoIncBuildNr=0
+
+[Unit6]
+FileName=..\..\bios.cpp
+CompileCpp=1
+Folder=desmume
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit5]
+FileName=..\..\armcpu.h
+CompileCpp=1
+Folder=desmume
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
--- a/desmume/src/gtk/dev-cpp/desmume.layout
+++ b/desmume/src/gtk/dev-cpp/desmume.layout
@ -0,0 +1,113 @@
+[Editor_4]
+CursorCol=1
+CursorRow=78
+TopLine=169
+LeftChar=1
+Open=0
+Top=0
+[Editors]
+Focused=-1
+Order=-1
+[Editor_0]
+Open=0
+Top=0
+CursorCol=1
+CursorRow=878
+TopLine=867
+LeftChar=1
+[Editor_1]
+Open=0
+Top=0
+[Editor_2]
+Open=0
+Top=0
+CursorCol=15
+CursorRow=3626
+TopLine=3605
+LeftChar=1
+[Editor_3]
+Open=0
+Top=0
+[Editor_5]
+Open=0
+Top=0
+[Editor_6]
+Open=0
+Top=0
+[Editor_7]
+Open=0
+Top=0
+[Editor_8]
+Open=0
+Top=0
+[Editor_9]
+Open=0
+Top=0
+[Editor_10]
+Open=0
+Top=0
+CursorCol=8
+CursorRow=3315
+TopLine=3305
+LeftChar=1
+[Editor_11]
+Open=0
+Top=0
+[Editor_12]
+Open=0
+Top=0
+[Editor_13]
+Open=0
+Top=0
+CursorCol=29
+CursorRow=1063
+TopLine=1043
+LeftChar=1
+[Editor_14]
+Open=0
+Top=0
+CursorCol=1
+CursorRow=1
+TopLine=1
+LeftChar=1
+[Editor_15]
+Open=0
+Top=0
+[Editor_16]
+Open=0
+Top=0
+[Editor_17]
+Open=0
+Top=0
+[Editor_18]
+Open=0
+Top=0
+[Editor_19]
+Open=0
+Top=0
+[Editor_20]
+Open=0
+Top=0
+[Editor_21]
+Open=0
+Top=0
+CursorCol=47
+CursorRow=242
+TopLine=191
+LeftChar=1
+[Editor_22]
+Open=0
+Top=0
+CursorCol=10
+CursorRow=487
+TopLine=474
+LeftChar=1
+[Editor_23]
+Open=0
+Top=0
+[Editor_24]
+Open=0
+Top=0
+[Editor_25]
+Open=0
+Top=0
--- a/desmume/src/gtk/dev-cpp/pthread.h
+++ b/desmume/src/gtk/dev-cpp/pthread.h
--- a/desmume/src/gtk/dev-cpp/sched.h
+++ b/desmume/src/gtk/dev-cpp/sched.h
@ -0,0 +1,178 @@
+/*
+ * Module: sched.h
+ *
+ * Purpose:
+ *      Provides an implementation of POSIX realtime extensions
+ *      as defined in 
+ *
+ *              POSIX 1003.1b-1993      (POSIX.1b)
+ *
+ * --------------------------------------------------------------------------
+ *
+ *      Pthreads-win32 - POSIX Threads Library for Win32
+ *      Copyright(C) 1998 John E. Bossom
+ *      Copyright(C) 1999,2005 Pthreads-win32 contributors
+ * 
+ *      Contact Email: rpj@callisto.canberra.edu.au
+ * 
+ *      The current list of contributors is contained
+ *      in the file CONTRIBUTORS included with the source
+ *      code distribution. The list can also be seen at the
+ *      following World Wide Web location:
+ *      http://sources.redhat.com/pthreads-win32/contributors.html
+ * 
+ *      This library is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU Lesser General Public
+ *      License as published by the Free Software Foundation; either
+ *      version 2 of the License, or (at your option) any later version.
+ * 
+ *      This library 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
+ *      Lesser General Public License for more details.
+ * 
+ *      You should have received a copy of the GNU Lesser General Public
+ *      License along with this library in the file COPYING.LIB;
+ *      if not, write to the Free Software Foundation, Inc.,
+ *      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+#ifndef _SCHED_H
+#define _SCHED_H
+
+#undef PTW32_LEVEL
+
+#if defined(_POSIX_SOURCE)
+#define PTW32_LEVEL 0
+/* Early POSIX */
+#endif
+
+#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 199309
+#undef PTW32_LEVEL
+#define PTW32_LEVEL 1
+/* Include 1b, 1c and 1d */
+#endif
+
+#if defined(INCLUDE_NP)
+#undef PTW32_LEVEL
+#define PTW32_LEVEL 2
+/* Include Non-Portable extensions */
+#endif
+
+#define PTW32_LEVEL_MAX 3
+
+#if !defined(PTW32_LEVEL)
+#define PTW32_LEVEL PTW32_LEVEL_MAX
+/* Include everything */
+#endif
+
+
+#if __GNUC__ && ! defined (__declspec)
+# error Please upgrade your GNU compiler to one that supports __declspec.
+#endif
+
+/*
+ * When building the DLL code, you should define PTW32_BUILD so that
+ * the variables/functions are exported correctly. When using the DLL,
+ * do NOT define PTW32_BUILD, and then the variables/functions will
+ * be imported correctly.
+ */
+#ifndef PTW32_STATIC_LIB
+#  ifdef PTW32_BUILD
+#    define PTW32_DLLPORT __declspec (dllexport)
+#  else
+#    define PTW32_DLLPORT __declspec (dllimport)
+#  endif
+#else
+#  define PTW32_DLLPORT
+#endif
+
+/*
+ * This is a duplicate of what is in the autoconf config.h,
+ * which is only used when building the pthread-win32 libraries.
+ */
+
+#ifndef PTW32_CONFIG_H
+#  if defined(WINCE)
+#    define NEED_ERRNO
+#    define NEED_SEM
+#  endif
+#  if defined(_UWIN) || defined(__MINGW32__)
+#    define HAVE_MODE_T
+#  endif
+#endif
+
+/*
+ *
+ */
+
+#if PTW32_LEVEL >= PTW32_LEVEL_MAX
+#ifdef NEED_ERRNO
+#include "need_errno.h"
+#else
+#include <errno.h>
+#endif
+#endif /* PTW32_LEVEL >= PTW32_LEVEL_MAX */
+
+#if defined(__MINGW32__) || defined(_UWIN)
+#if PTW32_LEVEL >= PTW32_LEVEL_MAX
+/* For pid_t */
+#  include <sys/types.h>
+/* Required by Unix 98 */
+#  include <time.h>
+#endif /* PTW32_LEVEL >= PTW32_LEVEL_MAX */
+#else
+typedef int pid_t;
+#endif
+
+/* Thread scheduling policies */
+
+enum {
+  SCHED_OTHER = 0,
+  SCHED_FIFO,
+  SCHED_RR,
+  SCHED_MIN   = SCHED_OTHER,
+  SCHED_MAX   = SCHED_RR
+};
+
+struct sched_param {
+  int sched_priority;
+};
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif                          /* __cplusplus */
+
+PTW32_DLLPORT int __cdecl sched_yield (void);
+
+PTW32_DLLPORT int __cdecl sched_get_priority_min (int policy);
+
+PTW32_DLLPORT int __cdecl sched_get_priority_max (int policy);
+
+PTW32_DLLPORT int __cdecl sched_setscheduler (pid_t pid, int policy);
+
+PTW32_DLLPORT int __cdecl sched_getscheduler (pid_t pid);
+
+/*
+ * Note that this macro returns ENOTSUP rather than
+ * ENOSYS as might be expected. However, returning ENOSYS
+ * should mean that sched_get_priority_{min,max} are
+ * not implemented as well as sched_rr_get_interval.
+ * This is not the case, since we just don't support
+ * round-robin scheduling. Therefore I have chosen to
+ * return the same value as sched_setscheduler when
+ * SCHED_RR is passed to it.
+ */
+#define sched_rr_get_interval(_pid, _interval) \
+  ( errno = ENOTSUP, (int) -1 )
+
+
+#ifdef __cplusplus
+}                               /* End of extern "C" */
+#endif                          /* __cplusplus */
+
+#undef PTW32_LEVEL
+#undef PTW32_LEVEL_MAX
+
+#endif                          /* !_SCHED_H */
+
--- a/desmume/src/gtk/dev-cpp/semaphore.h
+++ b/desmume/src/gtk/dev-cpp/semaphore.h
@ -0,0 +1,166 @@
+/*
+ * Module: semaphore.h
+ *
+ * Purpose:
+ *	Semaphores aren't actually part of the PThreads standard.
+ *	They are defined by the POSIX Standard:
+ *
+ *		POSIX 1003.1b-1993	(POSIX.1b)
+ *
+ * --------------------------------------------------------------------------
+ *
+ *      Pthreads-win32 - POSIX Threads Library for Win32
+ *      Copyright(C) 1998 John E. Bossom
+ *      Copyright(C) 1999,2005 Pthreads-win32 contributors
+ * 
+ *      Contact Email: rpj@callisto.canberra.edu.au
+ * 
+ *      The current list of contributors is contained
+ *      in the file CONTRIBUTORS included with the source
+ *      code distribution. The list can also be seen at the
+ *      following World Wide Web location:
+ *      http://sources.redhat.com/pthreads-win32/contributors.html
+ * 
+ *      This library is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU Lesser General Public
+ *      License as published by the Free Software Foundation; either
+ *      version 2 of the License, or (at your option) any later version.
+ * 
+ *      This library 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
+ *      Lesser General Public License for more details.
+ * 
+ *      You should have received a copy of the GNU Lesser General Public
+ *      License along with this library in the file COPYING.LIB;
+ *      if not, write to the Free Software Foundation, Inc.,
+ *      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+#if !defined( SEMAPHORE_H )
+#define SEMAPHORE_H
+
+#undef PTW32_LEVEL
+
+#if defined(_POSIX_SOURCE)
+#define PTW32_LEVEL 0
+/* Early POSIX */
+#endif
+
+#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 199309
+#undef PTW32_LEVEL
+#define PTW32_LEVEL 1
+/* Include 1b, 1c and 1d */
+#endif
+
+#if defined(INCLUDE_NP)
+#undef PTW32_LEVEL
+#define PTW32_LEVEL 2
+/* Include Non-Portable extensions */
+#endif
+
+#define PTW32_LEVEL_MAX 3
+
+#if !defined(PTW32_LEVEL)
+#define PTW32_LEVEL PTW32_LEVEL_MAX
+/* Include everything */
+#endif
+
+#if __GNUC__ && ! defined (__declspec)
+# error Please upgrade your GNU compiler to one that supports __declspec.
+#endif
+
+/*
+ * When building the DLL code, you should define PTW32_BUILD so that
+ * the variables/functions are exported correctly. When using the DLL,
+ * do NOT define PTW32_BUILD, and then the variables/functions will
+ * be imported correctly.
+ */
+#ifndef PTW32_STATIC_LIB
+#  ifdef PTW32_BUILD
+#    define PTW32_DLLPORT __declspec (dllexport)
+#  else
+#    define PTW32_DLLPORT __declspec (dllimport)
+#  endif
+#else
+#  define PTW32_DLLPORT
+#endif
+
+/*
+ * This is a duplicate of what is in the autoconf config.h,
+ * which is only used when building the pthread-win32 libraries.
+ */
+
+#ifndef PTW32_CONFIG_H
+#  if defined(WINCE)
+#    define NEED_ERRNO
+#    define NEED_SEM
+#  endif
+#  if defined(_UWIN) || defined(__MINGW32__)
+#    define HAVE_MODE_T
+#  endif
+#endif
+
+/*
+ *
+ */
+
+#if PTW32_LEVEL >= PTW32_LEVEL_MAX
+#ifdef NEED_ERRNO
+#include "need_errno.h"
+#else
+#include <errno.h>
+#endif
+#endif /* PTW32_LEVEL >= PTW32_LEVEL_MAX */
+
+#define _POSIX_SEMAPHORES
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif				/* __cplusplus */
+
+#ifndef HAVE_MODE_T
+typedef unsigned int mode_t;
+#endif
+
+
+typedef struct sem_t_ * sem_t;
+
+PTW32_DLLPORT int __cdecl sem_init (sem_t * sem,
+			    int pshared,
+			    unsigned int value);
+
+PTW32_DLLPORT int __cdecl sem_destroy (sem_t * sem);
+
+PTW32_DLLPORT int __cdecl sem_trywait (sem_t * sem);
+
+PTW32_DLLPORT int __cdecl sem_wait (sem_t * sem);
+
+PTW32_DLLPORT int __cdecl sem_timedwait (sem_t * sem,
+				 const struct timespec * abstime);
+
+PTW32_DLLPORT int __cdecl sem_post (sem_t * sem);
+
+PTW32_DLLPORT int __cdecl sem_post_multiple (sem_t * sem,
+				     int count);
+
+PTW32_DLLPORT int __cdecl sem_open (const char * name,
+			    int oflag,
+			    mode_t mode,
+			    unsigned int value);
+
+PTW32_DLLPORT int __cdecl sem_close (sem_t * sem);
+
+PTW32_DLLPORT int __cdecl sem_unlink (const char * name);
+
+PTW32_DLLPORT int __cdecl sem_getvalue (sem_t * sem,
+				int * sval);
+
+#ifdef __cplusplus
+}				/* End of extern "C" */
+#endif				/* __cplusplus */
+
+#undef PTW32_LEVEL
+#undef PTW32_LEVEL_MAX
+
+#endif				/* !SEMAPHORE_H */
--- a/desmume/src/windows/DeSmuME.dev
+++ b/desmume/src/windows/DeSmuME.dev
--- a/desmume/src/windows/DeSmuME.layout
+++ b/desmume/src/windows/DeSmuME.layout
@ -6,21 +6,21 @@ LeftChar=1
 Open=0
 Top=0
 [Editors]
-Focused=46
-Order=
+Focused=0
+Order=0,20,1,47
 [Editor_0]
-Open=0
-Top=0
-CursorCol=3
-CursorRow=18
-TopLine=1
+Open=1
+Top=1
+CursorCol=21
+CursorRow=30
+TopLine=25
 LeftChar=1
 [Editor_1]
-Open=0
+Open=1
 Top=0
-CursorCol=21
-CursorRow=439
-TopLine=425
+CursorCol=55
+CursorRow=40
+TopLine=28
 LeftChar=1
 [Editor_2]
 Open=0
@ -142,11 +142,11 @@ CursorRow=4
 TopLine=1
 LeftChar=1
 [Editor_20]
-Open=0
+Open=1
 Top=0
-CursorCol=1
-CursorRow=4
-TopLine=1
+CursorCol=37
+CursorRow=151
+TopLine=16
 LeftChar=1
 [Editor_21]
 Open=0
@ -160,7 +160,7 @@ Open=0
 Top=0
 CursorCol=1
 CursorRow=4
-TopLine=1
+TopLine=2
 LeftChar=1
 [Editor_23]
 Open=0
@ -317,16 +317,23 @@ CursorRow=4
 TopLine=1
 LeftChar=1
 [Editor_45]
-Open=1
+Open=0
 Top=0
 CursorCol=1
 CursorRow=4
 TopLine=1
 LeftChar=1
 [Editor_46]
-Open=1
-Top=1
+Open=0
+Top=0
 CursorCol=1
 CursorRow=4
 TopLine=1
 LeftChar=1
+[Editor_47]
+Open=1
+Top=0
+CursorCol=1
+CursorRow=151
+TopLine=128
+LeftChar=1
--- a/desmume/src/windows/Makefile.win
+++ b/desmume/src/windows/Makefile.win
@ -5,11 +5,11 @@ CPP  = g++.exe
 CC   = gcc.exe
 WINDRES = windres.exe
 RES  = obj/yopyop_private.res
-OBJ  = obj/main.o obj/MMU.o obj/mem_view.o obj/ARM_CPU.o obj/arm_instructions.o obj/des_view.o obj/Desassembleur.o obj/thumb_instructions.o obj/NDSSystem.o obj/ginfo.o obj/CP15.o obj/bios.o obj/IORegView.o obj/log.o obj/palView.o obj/CWindow.o obj/tileView.o obj/mapView.o obj/GPU.o obj/oamView.o $(RES)
-LINKOBJ  = obj/main.o obj/MMU.o obj/mem_view.o obj/ARM_CPU.o obj/arm_instructions.o obj/des_view.o obj/Desassembleur.o obj/thumb_instructions.o obj/NDSSystem.o obj/ginfo.o obj/CP15.o obj/bios.o obj/IORegView.o obj/log.o obj/palView.o obj/CWindow.o obj/tileView.o obj/mapView.o obj/GPU.o obj/oamView.o $(RES)
-LIBS =  -L"C:/teleir/Dev-Cpp/lib" -lmingw32 -lopengl32 -lSDLmain -lSDL -mwindows  -s -march=pentium4 -msse2 
-INCS =  -I"C:/teleir/Dev-Cpp/include" 
-CXXINCS =  -I"C:/teleir/Dev-Cpp/lib/gcc/mingw32/3.4.2/include"  -I"C:/teleir/Dev-Cpp/include/c++/3.4.2/backward"  -I"C:/teleir/Dev-Cpp/include/c++/3.4.2/mingw32"  -I"C:/teleir/Dev-Cpp/include/c++/3.4.2"  -I"C:/teleir/Dev-Cpp/include" 
+OBJ  = obj/main.o obj/mem_view.o obj/des_view.o obj/ginfo.o obj/IORegView.o obj/palView.o obj/CWindow.o obj/tileView.o obj/mapView.o obj/oamView.o obj/arm_instructions.o obj/armcpu.o obj/bios.o obj/cp15.o obj/debug.o obj/Disassembler.o obj/FIFO.o obj/GPU.o obj/MMU.o obj/NDSSystem.o obj/thumb_instructions.o $(RES)
+LINKOBJ  = obj/main.o obj/mem_view.o obj/des_view.o obj/ginfo.o obj/IORegView.o obj/palView.o obj/CWindow.o obj/tileView.o obj/mapView.o obj/oamView.o obj/arm_instructions.o obj/armcpu.o obj/bios.o obj/cp15.o obj/debug.o obj/Disassembler.o obj/FIFO.o obj/GPU.o obj/MMU.o obj/NDSSystem.o obj/thumb_instructions.o $(RES)
+LIBS =  -L"lib" -mwindows  -s -march=pentium4 -msse2 
+INCS =  -I"include" 
+CXXINCS =  -I"lib/gcc/mingw32/3.4.2/include"  -I"include/c++/3.4.2/backward"  -I"include/c++/3.4.2/mingw32"  -I"include/c++/3.4.2"  -I"include" 
 BIN  = DeSmuME.exe
 CXXFLAGS = $(CXXINCS)   -fexpensive-optimizations -O3 -march=pentium4 -msse2
 CFLAGS = $(INCS)   -fexpensive-optimizations -O3 -march=pentium4 -msse2
@ -29,45 +29,18 @@ $(BIN): $(OBJ)
 obj/main.o: main.cpp
 	$(CPP) -c main.cpp -o obj/main.o $(CXXFLAGS)

-obj/MMU.o: ../EmuSRC/MMU.cpp
-	$(CPP) -c ../EmuSRC/MMU.cpp -o obj/MMU.o $(CXXFLAGS)
-
 obj/mem_view.o: mem_view.cpp
 	$(CPP) -c mem_view.cpp -o obj/mem_view.o $(CXXFLAGS)

-obj/ARM_CPU.o: ../EmuSRC/ARM_CPU.cpp
-	$(CPP) -c ../EmuSRC/ARM_CPU.cpp -o obj/ARM_CPU.o $(CXXFLAGS)
-
-obj/arm_instructions.o: ../EmuSRC/arm_instructions.cpp
-	$(CC) -c ../EmuSRC/arm_instructions.cpp -o obj/arm_instructions.o $(CFLAGS)
-
 obj/des_view.o: des_view.cpp
 	$(CPP) -c des_view.cpp -o obj/des_view.o $(CXXFLAGS)

-obj/Desassembleur.o: ../EmuSRC/Desassembleur.cpp
-	$(CC) -c ../EmuSRC/Desassembleur.cpp -o obj/Desassembleur.o $(CFLAGS)
-
-obj/thumb_instructions.o: ../EmuSRC/thumb_instructions.cpp
-	$(CC) -c ../EmuSRC/thumb_instructions.cpp -o obj/thumb_instructions.o $(CFLAGS)
-
-obj/NDSSystem.o: ../EmuSRC/NDSSystem.cpp
-	$(CPP) -c ../EmuSRC/NDSSystem.cpp -o obj/NDSSystem.o $(CXXFLAGS)
-
 obj/ginfo.o: ginfo.cpp
 	$(CPP) -c ginfo.cpp -o obj/ginfo.o $(CXXFLAGS)

-obj/CP15.o: ../EmuSRC/CP15.cpp
-	$(CPP) -c ../EmuSRC/CP15.cpp -o obj/CP15.o $(CXXFLAGS)
-
-obj/bios.o: ../EmuSRC/bios.cpp
-	$(CC) -c ../EmuSRC/bios.cpp -o obj/bios.o $(CFLAGS)
-
 obj/IORegView.o: IORegView.cpp
 	$(CPP) -c IORegView.cpp -o obj/IORegView.o $(CXXFLAGS)

-obj/log.o: ../EmuSRC/log.cpp
-	$(CPP) -c ../EmuSRC/log.cpp -o obj/log.o $(CXXFLAGS)
-
 obj/palView.o: palView.cpp
 	$(CPP) -c palView.cpp -o obj/palView.o $(CXXFLAGS)

@ -80,11 +53,41 @@ obj/tileView.o: tileView.cpp
 obj/mapView.o: mapView.cpp
 	$(CPP) -c mapView.cpp -o obj/mapView.o $(CXXFLAGS)

-obj/GPU.o: GPU.cpp
-	$(CPP) -c GPU.cpp -o obj/GPU.o $(CXXFLAGS)
-
 obj/oamView.o: oamView.cpp
 	$(CPP) -c oamView.cpp -o obj/oamView.o $(CXXFLAGS)

-obj/yopyop_private.res: yopyop_private.rc resources.rc 
+obj/arm_instructions.o: ../arm_instructions.cpp
+	$(CPP) -c ../arm_instructions.cpp -o obj/arm_instructions.o $(CXXFLAGS)
+
+obj/armcpu.o: ../armcpu.cpp
+	$(CPP) -c ../armcpu.cpp -o obj/armcpu.o $(CXXFLAGS)
+
+obj/bios.o: ../bios.cpp
+	$(CPP) -c ../bios.cpp -o obj/bios.o $(CXXFLAGS)
+
+obj/cp15.o: ../cp15.cpp
+	$(CPP) -c ../cp15.cpp -o obj/cp15.o $(CXXFLAGS)
+
+obj/debug.o: ../debug.c
+	$(CPP) -c ../debug.c -o obj/debug.o $(CXXFLAGS)
+
+obj/Disassembler.o: ../Disassembler.cpp
+	$(CPP) -c ../Disassembler.cpp -o obj/Disassembler.o $(CXXFLAGS)
+
+obj/FIFO.o: ../FIFO.cpp
+	$(CPP) -c ../FIFO.cpp -o obj/FIFO.o $(CXXFLAGS)
+
+obj/GPU.o: ../GPU.cpp
+	$(CPP) -c ../GPU.cpp -o obj/GPU.o $(CXXFLAGS)
+
+obj/MMU.o: ../MMU.cpp
+	$(CPP) -c ../MMU.cpp -o obj/MMU.o $(CXXFLAGS)
+
+obj/NDSSystem.o: ../NDSSystem.cpp
+	$(CPP) -c ../NDSSystem.cpp -o obj/NDSSystem.o $(CXXFLAGS)
+
+obj/thumb_instructions.o: ../thumb_instructions.cpp
+	$(CPP) -c ../thumb_instructions.cpp -o obj/thumb_instructions.o $(CXXFLAGS)
+
+obj/yopyop_private.res: yopyop_private.rc resources.rc yopyop_private.rc 
 	$(WINDRES) -i yopyop_private.rc --input-format=rc -o obj/yopyop_private.res -O coff 
--- a/desmume/src/windows/resource.h
+++ b/desmume/src/windows/resource.h
@ -149,4 +149,6 @@ void refreshAll();
 #define IDC_PROP1               909
 #define IDC_OAM_BOX             910

+#define IDM_PRINTSCREEN          140
+#define IDM_QUICK_PRINTSCREEN    141
 #endif
--- a/desmume/src/windows/resources.rc
+++ b/desmume/src/windows/resources.rc
@ -36,6 +36,9 @@ MENU_PRINCIPAL MENU
  MENUITEM "&Ouvrir", IDM_OPEN
  MENUITEM "&Info rom", IDM_GAME_INFO
  MENUITEM SEPARATOR
+  MENUITEM "&Printscreen", IDM_PRINTSCREEN
+  MENUITEM "&Quick Printscreen", IDM_QUICK_PRINTSCREEN
+  MENUITEM SEPARATOR
  MENUITEM "&Quitter", IDM_QUIT
 }
 POPUP "&Emulation"
--- a/desmume/src/windows/yopyop_private.h
+++ b/desmume/src/windows/yopyop_private.h
@ -0,0 +1,23 @@
+/* THIS FILE WILL BE OVERWRITTEN BY DEV-C++ */
+/* DO NOT EDIT ! */
+
+#ifndef YOPYOP_PRIVATE_H
+#define YOPYOP_PRIVATE_H
+
+/* VERSION DEFINITIONS */
+#define VER_STRING	"0.0.0.1"
+#define VER_MAJOR	0
+#define VER_MINOR	0
+#define VER_RELEASE	0
+#define VER_BUILD	1
+#define COMPANY_NAME	"yopyop"
+#define FILE_VERSION	""
+#define FILE_DESCRIPTION	"NDS(tm) emulator"
+#define INTERNAL_NAME	""
+#define LEGAL_COPYRIGHT	""
+#define LEGAL_TRADEMARKS	""
+#define ORIGINAL_FILENAME	""
+#define PRODUCT_NAME	"DeSmuME"
+#define PRODUCT_VERSION	""
+
+#endif /*YOPYOP_PRIVATE_H*/
--- a/desmume/src/windows/yopyop_private.rc
+++ b/desmume/src/windows/yopyop_private.rc
@ -4,6 +4,7 @@
 #include <windows.h> // include for version info constants

 #include "resources.rc"
+#include "yopyop_private.rc"

 //
 // SUPPORT FOR WINDOWS XP THEMES: