main.cpp - added GBAMP emulation thanks to mic

DeSmuME.dev - added icon and removed the include for the zlib dll, now it shouldnt require the dll

desmume/src/windows/DeSmuME.dev

@@ -1,7 +1,7 @@
 [Project]
 FileName=DeSmuME.dev
 Name=DeSmuME
-UnitCount=50
+UnitCount=52
 Type=0
 Ver=1
 ObjFiles=
@@ -12,9 +12,9 @@ ResourceIncludes=
 MakeIncludes=
 Compiler=
 CppCompiler=-DVERSION=\"0.3.3\"_@@_
-Linker=-lz -lz.dll_@@_
+Linker=-lz_@@_
 IsCpp=1
-Icon=
+Icon=DeSmuME.ico
 ExeOutput=
 ObjectOutput=obj
 OverrideOutput=0
@@ -42,9 +42,9 @@ BuildCmd=
 [VersionInfo]
 Major=0
 Minor=0
-Release=0
+Release=3
-Build=1
+Build=4
-LanguageID=1036
+LanguageID=5129
 CharsetID=1252
 CompanyName=yopyop
 FileVersion=
@@ -168,16 +168,6 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit21]
-FileName=resource.hpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit22]
 FileName=tileView.hpp
 CompileCpp=1
 Folder=
@@ -187,7 +177,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit23]
+[Unit22]
 FileName=yopyop_private.hpp
 CompileCpp=1
 Folder=
@@ -197,7 +187,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit24]
+[Unit23]
 FileName=..\types.h
 CompileCpp=1
 Folder=DeSmuME
@@ -207,7 +197,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit25]
+[Unit24]
 FileName=..\arm_instructions.cpp
 CompileCpp=1
 Folder=DeSmuME
@@ -217,7 +207,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit26]
+[Unit25]
 FileName=..\arm_instructions.h
 CompileCpp=1
 Folder=DeSmuME
@@ -227,7 +217,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit27]
+[Unit26]
 FileName=..\armcpu.cpp
 CompileCpp=1
 Folder=DeSmuME
@@ -237,7 +227,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit28]
+[Unit27]
 FileName=..\armcpu.h
 CompileCpp=1
 Folder=DeSmuME
@@ -247,7 +237,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit29]
+[Unit28]
 FileName=..\bios.cpp
 CompileCpp=1
 Folder=DeSmuME
@@ -257,8 +247,8 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit32]
+[Unit29]
-FileName=..\cp15.cpp
+FileName=..\bios.hpp
 CompileCpp=1
 Folder=DeSmuME
 Compile=1
@@ -267,7 +257,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit33]
+[Unit32]
 FileName=..\cp15.h
 CompileCpp=1
 Folder=DeSmuME
@@ -277,7 +267,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit34]
+[Unit33]
 FileName=..\debug.c
 CompileCpp=1
 Folder=DeSmuME
@@ -287,57 +277,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit37]
+[Unit34]
-FileName=..\Disassembler.hpp
-CompileCpp=1
-Folder=DeSmuME
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit41]
-FileName=..\GPU.hpp
-CompileCpp=1
-Folder=DeSmuME
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit42]
-FileName=..\MMU.cpp
-CompileCpp=1
-Folder=DeSmuME
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit43]
-FileName=..\MMU.hpp
-CompileCpp=1
-Folder=DeSmuME
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit46]
-FileName=..\thumb_instructions.cpp
-CompileCpp=1
-Folder=DeSmuME
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit35]
 FileName=..\debug.h
 CompileCpp=1
 Folder=DeSmuME
@@ -347,107 +287,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit40]
+[Unit37]
-FileName=..\GPU.cpp
-CompileCpp=1
-Folder=DeSmuME
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit44]
-FileName=..\NDSSystem.cpp
-CompileCpp=1
-Folder=DeSmuME
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit45]
-FileName=..\NDSSystem.hpp
-CompileCpp=1
-Folder=DeSmuME
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit47]
-FileName=..\thumb_instructions.h
-CompileCpp=1
-Folder=DeSmuME
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit48]
-FileName=resource.h
-CompileCpp=1
-Folder=DeSmuME
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit49]
-FileName=saves.cpp
-CompileCpp=1
-Folder=DeSmuME
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit50]
-FileName=saves.hpp
-CompileCpp=1
-Folder=DeSmuME
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit51]
-FileName=yopyop_private.hpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit31]
-FileName=..\config.h
-CompileCpp=1
-Folder=DeSmuME
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit36]
-FileName=..\Disassembler.cpp
-CompileCpp=1
-Folder=DeSmuME
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit38]
 FileName=..\FIFO.cpp
 CompileCpp=1
 Folder=DeSmuME
@@ -457,7 +297,157 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit39]
+[Unit41]
+FileName=..\MMU.cpp
+CompileCpp=1
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit42]
+FileName=..\MMU.hpp
+CompileCpp=1
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit43]
+FileName=..\NDSSystem.cpp
+CompileCpp=1
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit46]
+FileName=..\thumb_instructions.h
+CompileCpp=1
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit35]
+FileName=..\Disassembler.cpp
+CompileCpp=1
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit40]
+FileName=..\GPU.hpp
+CompileCpp=1
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit44]
+FileName=..\NDSSystem.hpp
+CompileCpp=1
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit45]
+FileName=..\thumb_instructions.cpp
+CompileCpp=1
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit47]
+FileName=resource.h
+CompileCpp=1
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit48]
+FileName=saves.cpp
+CompileCpp=1
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit49]
+FileName=saves.hpp
+CompileCpp=1
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit50]
+FileName=cflash.h
+CompileCpp=1
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit51]
+FileName=fat.h
+CompileCpp=1
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit31]
+FileName=..\cp15.cpp
+CompileCpp=1
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit36]
+FileName=..\Disassembler.hpp
+CompileCpp=1
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit38]
 FileName=..\FIFO.hpp
 CompileCpp=1
 Folder=DeSmuME
@@ -467,8 +457,18 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit39]
+FileName=..\GPU.cpp
+CompileCpp=1
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
 [Unit52]
-FileName=MMU.hpp
+FileName=cflash.cpp
 CompileCpp=1
 Folder=DeSmuME
 Compile=1
@@ -648,7 +648,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit30]
-FileName=..\bios.hpp
+FileName=..\config.h
 CompileCpp=1
 Folder=DeSmuME
 Compile=1

desmume/src/windows/yopyop_private.rc

@@ -4,6 +4,9 @@
 #include <windows.h> // include for version info constants
 
 #include "resources.rc"
+#include "yopyop_private.rc"
+
+A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "DeSmuME.ico"
 
 //
 // SUPPORT FOR WINDOWS XP THEMES:
@@ -16,13 +19,13 @@
 // TO CHANGE VERSION INFORMATION, EDIT PROJECT OPTIONS...
 //
 1 VERSIONINFO
-FILEVERSION 0,0,0,1
+FILEVERSION 0,0,3,4
-PRODUCTVERSION 0,0,0,1
+PRODUCTVERSION 0,0,3,4
 FILETYPE VFT_APP
 {
   BLOCK "StringFileInfo"
 	 {
-		 BLOCK "040C04E4"
+		 BLOCK "140904E4"
 		 {
 			 VALUE "CompanyName", "yopyop"
 			 VALUE "FileVersion", ""
@@ -37,7 +40,7 @@ FILETYPE VFT_APP
 	 }
   BLOCK "VarFileInfo"
 	 {
-		 VALUE "Translation", 0x040C, 1252
+		 VALUE "Translation", 0x1409, 1252
 	 }
 }