From 230cafdbc03f923a3f0b58e19c8efd9d398f5730 Mon Sep 17 00:00:00 2001 From: cyberwarriorx Date: Wed, 5 Apr 2006 23:13:44 +0000 Subject: [PATCH] -Initial source add. Windows-specific code --- desmume/src/windows/DeSmuME.dev | 556 ++++++++++++++++++++++++++ desmume/src/windows/DeSmuME.ico | Bin 0 -> 766 bytes desmume/src/windows/DeSmuME.layout | 332 +++++++++++++++ desmume/src/windows/Makefile.win | 90 +++++ desmume/src/windows/oamView.h | 40 ++ desmume/src/windows/resources.rc | 280 +++++++++++++ desmume/src/windows/yopyop_private.rc | 43 ++ 7 files changed, 1341 insertions(+) create mode 100644 desmume/src/windows/DeSmuME.dev create mode 100644 desmume/src/windows/DeSmuME.ico create mode 100644 desmume/src/windows/DeSmuME.layout create mode 100644 desmume/src/windows/Makefile.win create mode 100644 desmume/src/windows/oamView.h create mode 100644 desmume/src/windows/resources.rc create mode 100644 desmume/src/windows/yopyop_private.rc diff --git a/desmume/src/windows/DeSmuME.dev b/desmume/src/windows/DeSmuME.dev new file mode 100644 index 000000000..0795b6266 --- /dev/null +++ b/desmume/src/windows/DeSmuME.dev @@ -0,0 +1,556 @@ +[Project] +FileName=DeSmuME.dev +Name=DeSmuME +UnitCount=47 +Type=0 +Ver=1 +ObjFiles= +Includes= +Libs= +PrivateResource=yopyop_private.rc +ResourceIncludes= +MakeIncludes= +Compiler= +CppCompiler= +Linker= +IsCpp=1 +Icon= +ExeOutput= +ObjectOutput=obj +OverrideOutput=0 +OverrideOutputName=DeSmuME.exe +HostApplication= +Folders=EmuSRC,EmuSRC/CPU,EmuSRC/Desassembleur,EmuSRC/MMU,EmuSRC/NDSSys,Resources +CommandLine= +UseCustomMakefile=0 +CustomMakefile= +IncludeVersionInfo=1 +SupportXPThemes=1 +CompilerSet=0 +CompilerSettings=00000000010010000001ib + +[Unit1] +FileName=main.cpp +CompileCpp=1 +Folder= +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit2] +FileName=..\EmuSRC\MMU.cpp +CompileCpp=1 +Folder=EmuSRC/MMU +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[VersionInfo] +Major=0 +Minor=0 +Release=0 +Build=1 +LanguageID=1036 +CharsetID=1252 +CompanyName=yopyop +FileVersion= +FileDescription=NDS(tm) emulator +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName=DeSmuME +ProductVersion= +AutoIncBuildNr=0 + +[Unit3] +FileName=..\EmuSRC\MMU.h +CompileCpp=1 +Folder=EmuSRC/MMU +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit4] +FileName=resource.h +CompileCpp=1 +Folder= +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit5] +FileName=resources.rc +Folder=Resources +Compile=1 +Link=0 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit6] +FileName=mem_view.cpp +CompileCpp=1 +Folder= +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit7] +FileName=mem_view.h +CompileCpp=1 +Folder= +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit8] +FileName=..\EmuSRC\ARM_CPU.cpp +CompileCpp=1 +Folder=EmuSRC/CPU +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit9] +FileName=..\EmuSRC\ARM_CPU.h +CompileCpp=1 +Folder=EmuSRC/CPU +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit10] +FileName=..\EmuSRC\arm_instructions.cpp +CompileCpp=0 +Folder=EmuSRC/CPU +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd=$(CC) -c arm_instructions.cpp -o obj/arm_instructions.o $(CFLAGS) + +[Unit11] +FileName=..\EmuSRC\arm_instructions.h +CompileCpp=1 +Folder=EmuSRC/CPU +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit12] +FileName=des_view.cpp +CompileCpp=1 +Folder= +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit13] +FileName=des_view.h +CompileCpp=1 +Folder= +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit14] +FileName=..\EmuSRC\Desassembleur.h +CompileCpp=1 +Folder=EmuSRC/Desassembleur +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit15] +FileName=..\EmuSRC\Desassembleur.cpp +CompileCpp=0 +Folder=EmuSRC/Desassembleur +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd=$(CC) -c Desassembleur.cpp -o obj/Desassembleur.o $(CFLAGS) + +[Unit16] +FileName=..\EmuSRC\instruction_tabdef.inc +Folder=EmuSRC/CPU +Compile=0 +Link=0 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit17] +FileName=..\EmuSRC\ICoProc.h +CompileCpp=1 +Folder=EmuSRC/CPU +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit18] +FileName=..\EmuSRC\thumb_instructions.cpp +CompileCpp=0 +Folder=EmuSRC/CPU +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd=$(CC) -c thumb_instructions.cpp -o obj/thumb_instructions.o $(CFLAGS) + +[Unit19] +FileName=..\EmuSRC\thumb_tabdef.inc +Folder=EmuSRC/CPU +Compile=0 +Link=0 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit20] +FileName=..\EmuSRC\thumb_instructions.h +CompileCpp=1 +Folder=EmuSRC/CPU +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit21] +FileName=..\EmuSRC\NDSSystem.cpp +CompileCpp=1 +Folder=EmuSRC/NDSSys +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit22] +FileName=..\EmuSRC\NDSSystem.h +CompileCpp=1 +Folder=EmuSRC/NDSSys +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit23] +FileName=ginfo.h +CompileCpp=1 +Folder= +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit24] +FileName=ginfo.cpp +CompileCpp=1 +Folder= +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit25] +FileName=..\EmuSRC\CP15.h +CompileCpp=1 +Folder=EmuSRC/CPU +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit26] +FileName=..\EmuSRC\CP15.cpp +CompileCpp=1 +Folder=EmuSRC/CPU +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit27] +FileName=..\EmuSRC\bios.cpp +CompileCpp=0 +Folder=EmuSRC/CPU +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd=$(CC) -c bios.cpp -o obj/bios.o $(CFLAGS) + +[Unit28] +FileName=..\EmuSRC\bios.h +CompileCpp=1 +Folder=EmuSRC/CPU +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit29] +FileName=..\EmuSRC\FIFO.h +CompileCpp=1 +Folder=EmuSRC/MMU +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit32] +FileName=..\EmuSRC\log.h +CompileCpp=1 +Folder= +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit33] +FileName=..\EmuSRC\log.cpp +CompileCpp=1 +Folder= +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit34] +FileName=palView.cpp +CompileCpp=1 +Folder= +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit37] +FileName=CWindow.h +CompileCpp=1 +Folder= +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit41] +FileName=mapView.cpp +CompileCpp=1 +Folder= +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit42] +FileName=GPU.h +CompileCpp=1 +Folder= +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit43] +FileName=GPU.cpp +CompileCpp=1 +Folder= +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit46] +FileName=OGLRender.h +CompileCpp=1 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit35] +FileName=palView.h +CompileCpp=1 +Folder= +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit40] +FileName=mapView.h +CompileCpp=1 +Folder= +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit44] +FileName=oamView.h +CompileCpp=1 +Folder= +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit45] +FileName=oamView.cpp +CompileCpp=1 +Folder= +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit47] +FileName=OGLRender.cpp +CompileCpp=1 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit48] +FileName=mapView.h +CompileCpp=1 +Folder= +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit49] +FileName=mapView.cpp +CompileCpp=1 +Folder= +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit50] +FileName=GPU.h +CompileCpp=1 +Folder= +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit51] +FileName=GPU.cpp +CompileCpp=1 +Folder= +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit30] +FileName=IORegView.cpp +CompileCpp=1 +Folder= +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit31] +FileName=IORegView.h +CompileCpp=1 +Folder= +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit36] +FileName=CWindow.cpp +CompileCpp=1 +Folder= +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit38] +FileName=tileView.h +CompileCpp=1 +Folder= +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit39] +FileName=tileView.cpp +CompileCpp=1 +Folder= +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + diff --git a/desmume/src/windows/DeSmuME.ico b/desmume/src/windows/DeSmuME.ico new file mode 100644 index 0000000000000000000000000000000000000000..7f2dc4e09b330aaaf335de36d9a59309553c3bf3 GIT binary patch literal 766 zcmb7?v1-Cl6oyYqAE2j3t!=H*scXmsw1K>UgAd^1?&NB>;3l|a5xPk?=PY%|QiM?G zV26~}#SS855uwBFpWJGQ7_fiN&&hZHo8%BKk%CLp&WPxgzE6k>xVwcl_#RfU9;u5g zLjvpKXT7HNa!KKQPRrSh7QRn&&!Z35rT6ie-bN$xheLW949M&C=(*b!HHf#00NNr; ztg)zsq9R0^!{d2%^M&Hw^D(bhI}XaPs3Z@dauCS8x*I2huP0N~baF1otzM1YxU%^2 z@hPrto??8gDfQz#`8Z3q?S~87W;Ds2V!PPxFxp{m6`F-+i_v7h&y9RNUvDs) z%=g(+P1VE{sws2JGF8iBG|8OPb2_uZfAd9b7;G4NoY#`ycaU*#?vC*W`=k}Ip|o*A M@rwWX6Z<3o0@%dF{r~^~ literal 0 HcmV?d00001 diff --git a/desmume/src/windows/DeSmuME.layout b/desmume/src/windows/DeSmuME.layout new file mode 100644 index 000000000..acfdf0b12 --- /dev/null +++ b/desmume/src/windows/DeSmuME.layout @@ -0,0 +1,332 @@ +[Editor_9] +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +Open=0 +Top=0 +[Editors] +Focused=46 +Order= +[Editor_0] +Open=0 +Top=0 +CursorCol=3 +CursorRow=18 +TopLine=1 +LeftChar=1 +[Editor_1] +Open=0 +Top=0 +CursorCol=21 +CursorRow=439 +TopLine=425 +LeftChar=1 +[Editor_2] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_3] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_4] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_5] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_6] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_7] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_8] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_10] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_11] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_12] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_13] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_14] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_15] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_16] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_17] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_18] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_19] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_20] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_21] +Open=0 +Top=0 +CursorCol=35 +CursorRow=17 +TopLine=1 +LeftChar=1 +[Editor_22] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_23] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_24] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_25] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_26] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_27] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_28] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_29] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_30] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_31] +Open=0 +Top=0 +CursorCol=1 +CursorRow=14 +TopLine=1 +LeftChar=1 +[Editor_32] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_33] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_34] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_35] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_36] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_37] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_38] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_39] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_40] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_41] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_42] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_43] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_44] +Open=0 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_45] +Open=1 +Top=0 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 +[Editor_46] +Open=1 +Top=1 +CursorCol=1 +CursorRow=4 +TopLine=1 +LeftChar=1 diff --git a/desmume/src/windows/Makefile.win b/desmume/src/windows/Makefile.win new file mode 100644 index 000000000..724a7d1c0 --- /dev/null +++ b/desmume/src/windows/Makefile.win @@ -0,0 +1,90 @@ +# Project: DeSmuME +# Makefile created by Dev-C++ 4.9.9.2 + +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" +BIN = DeSmuME.exe +CXXFLAGS = $(CXXINCS) -fexpensive-optimizations -O3 -march=pentium4 -msse2 +CFLAGS = $(INCS) -fexpensive-optimizations -O3 -march=pentium4 -msse2 +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) + +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) + +obj/CWindow.o: CWindow.cpp + $(CPP) -c CWindow.cpp -o obj/CWindow.o $(CXXFLAGS) + +obj/tileView.o: tileView.cpp + $(CPP) -c tileView.cpp -o obj/tileView.o $(CXXFLAGS) + +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 + $(WINDRES) -i yopyop_private.rc --input-format=rc -o obj/yopyop_private.res -O coff diff --git a/desmume/src/windows/oamView.h b/desmume/src/windows/oamView.h new file mode 100644 index 000000000..9f665c217 --- /dev/null +++ b/desmume/src/windows/oamView.h @@ -0,0 +1,40 @@ +/* Copyright (C) 2006 yopyop + yopyop156@ifrance.com + yopyop156.ifrance.com + + This file is part of DeSmuME + + DeSmuME 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 of the License, or + (at your option) any later version. + + DeSmuME 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 DeSmuME; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#ifndef OAMVIEW_H +#define OAMVIEW_H + +#include "CWindow.hpp" +#include "GPU.hpp" + +class oamView : public CWindow +{ +public : + oamView(HINSTANCE hInst, HWND parent); + + signed short num; + OAM * oam; + GPU * gpu; +}; + +extern void InitOAMViewBox(); + +#endif diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc new file mode 100644 index 000000000..7aaf1d40a --- /dev/null +++ b/desmume/src/windows/resources.rc @@ -0,0 +1,280 @@ +/* Copyright (C) 2006 yopyop + yopyop156@ifrance.com + yopyop156.ifrance.com + + This file is part of DeSmuME + + DeSmuME 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 of the License, or + (at your option) any later version. + + DeSmuME 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 DeSmuME; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#include +#include "resource.hpp" + +IconDeSmuME ICON MOVEABLE PURE LOADONCALL DISCARDABLE "DeSmuME.ico" +//IconDeSmuME ICON MOVEABLE PURE LOADONCALL DISCARDABLE "DeSmuME3D.ico" + +MENU_PRINCIPAL MENU +{ + POPUP "&Fichier" + { + MENUITEM "&Ouvrir", IDM_OUVRIR + MENUITEM "&Info rom", IDM_GAME_INFO + MENUITEM SEPARATOR + MENUITEM "&Quitter", IDM_QUITTER + } + POPUP "&Emulation" + { + MENUITEM "&Execute", IDM_EXEC + MENUITEM "&Pause", IDM_PAUSE + MENUITEM "&Reset", IDM_RESET + } + POPUP "&Outils" + { + MENUITEM "&Desassembleur", IDM_DESASSEMBLEUR + MENUITEM "Visualiser la &memoire", IDM_MEMOIRE + MENUITEM "Visualiser les ®istres", IDM_IOREG +// MENUITEM "Visualiser le &log", IDM_LOG + MENUITEM "Visualiser les &palettes", IDM_PAL + MENUITEM "Visualiser les &tiles", IDM_TILE + MENUITEM "Visualiser les m&aps", IDM_MAP + MENUITEM "Visualiser les &oams", IDM_OAM + MENUITEM SEPARATOR + POPUP "&Visualiser les &couches" + { + MENUITEM "Main BG 0", IDM_MBG0, CHECKED + MENUITEM "Main BG 1", IDM_MBG1, CHECKED + MENUITEM "Main BG 2", IDM_MBG2, CHECKED + MENUITEM "Main BG 3", IDM_MBG3, CHECKED + MENUITEM SEPARATOR + MENUITEM "Sub BG 0", IDM_SBG0, CHECKED + MENUITEM "Sub BG 1", IDM_SBG1, CHECKED + MENUITEM "Sub BG 2", IDM_SBG2, CHECKED + MENUITEM "Sub BG 3", IDM_SBG3, CHECKED + } + } +} + + +IDD_MEM_VIEWER DIALOG DISCARDABLE 0, 0, 428, 178 +STYLE WS_SYSMENU +CAPTION "Visualisation de la memoire" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "8 bit",IDC_8_BIT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,4,29,10 + CONTROL "16 bit",IDC_16_BIT,"Button",BS_AUTORADIOBUTTON,44,4,33,10 + CONTROL "32 bit",IDC_32_BIT,"Button",BS_AUTORADIOBUTTON,82,4,33,10 + LTEXT "Aller E:",IDC_STATIC,130,4,33,10 + EDITTEXT IDC_GOTOMEM,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP + PUSHBUTTON "&GO",IDC_GO,240,1,20,14 + CONTROL "Auto-update",IDC_AUTO_UPDATE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,350,1,75,14 + CONTROL "Edit", IDC_MEM_BOX,"MemViewBox",WS_TABSTOP | WS_VSCROLL,4,16,424,142,WS_EX_CLIENTEDGE + PUSHBUTTON "&Fermer",IDC_FERMER,185,162,50,14 +END + +IDD_DESASSEMBLEUR_VIEWER DIALOG DISCARDABLE 0, 0, 380, 186 +STYLE WS_SYSMENU +CAPTION "Desassembleur" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "Auto ",IDC_AUTO_DES,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,4,35,10 + CONTROL "ARM",IDC_ARM,"Button",BS_AUTORADIOBUTTON,44,4,35,10 + CONTROL "Thumb",IDC_THUMB,"Button",BS_AUTORADIOBUTTON,82,4,40,10 + LTEXT "Aller E:",IDC_STATIC,130,4,33,10 + EDITTEXT IDC_GOTODES,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | + ES_WANTRETURN | WS_GROUP + PUSHBUTTON "&GO",IDC_GO,240,1,20,14 + CONTROL "Auto-update",IDC_AUTO_UPDATE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,300,1,75,14 + CONTROL "Edit", IDC_DES_BOX,"DesViewBox",WS_TABSTOP | WS_VSCROLL,4,16,296,150,WS_EX_CLIENTEDGE + PUSHBUTTON "&Fermer",IDC_FERMER,185,170,50,14 + EDITTEXT IDC_SETPNUM,5,170,65,14,ES_UPPERCASE | ES_AUTOHSCROLL | WS_GROUP | ES_NUMBER + PUSHBUTTON "&Step",IDC_STEP,75,170,50,14 + LTEXT "R0 :",IDC_STATIC,304,16,17,8 + LTEXT "R1 :",IDC_STATIC,304,24,17,8 + LTEXT "R2 :",IDC_STATIC,304,32,17,8 + LTEXT "R3 :",IDC_STATIC,304,40,17,8 + LTEXT "R4 :",IDC_STATIC,304,48,17,8 + LTEXT "R5 :",IDC_STATIC,304,56,17,8 + LTEXT "R6 :",IDC_STATIC,304,64,17,8 + LTEXT "R7 :",IDC_STATIC,304,72,17,8 + LTEXT "R8 :",IDC_STATIC,304,80,17,8 + LTEXT "R9 :",IDC_STATIC,304,88,17,8 + LTEXT "R10 :",IDC_STATIC,304,96,17,8 + LTEXT "R11 :",IDC_STATIC,304,104,17,8 + LTEXT "R12 :",IDC_STATIC,304,112,17,8 + LTEXT "SP :",IDC_STATIC,304,120,17,8 + LTEXT "LR :",IDC_STATIC,304,128,17,8 + LTEXT "PC :",IDC_STATIC,304,136,17,8 + LTEXT "Mode :",IDC_STATIC,304,158,22,8 + LTEXT "SPSR :",IDC_STATIC,304,168,22,8 + LTEXT "00000000",IDC_R0,325,16,40,8 + LTEXT "00000000",IDC_R1,325,24,40,8 + LTEXT "00000000",IDC_R2,325,32,40,8 + LTEXT "00000000",IDC_R3,325,40,40,8 + LTEXT "00000000",IDC_R4,325,48,40,8 + LTEXT "00000000",IDC_R5,325,56,40,8 + LTEXT "00000000",IDC_R6,325,64,40,8 + LTEXT "00000000",IDC_R7,325,72,40,8 + LTEXT "00000000",IDC_R8,325,80,40,8 + LTEXT "00000000",IDC_R9,325,88,40,8 + LTEXT "00000000",IDC_R10,325,96,40,8 + LTEXT "00000000",IDC_R11,325,104,40,8 + LTEXT "00000000",IDC_R12,325,112,40,8 + LTEXT "00000000",IDC_R13,325,120,40,8 + LTEXT "00000000",IDC_R14,325,128,40,8 + LTEXT "00000000",IDC_R15,325,136,40,8 + LTEXT "",IDC_MODE,327,158,28,8 + LTEXT "",IDC_TMP,327,168,40,8 +END + +IDD_GAME_INFO DIALOG DISCARDABLE 0, 0, 150, 150 +STYLE WS_VISIBLE | WS_SYSMENU +CAPTION "Info ROM" +FONT 8, "MS Sans Serif" +BEGIN + PUSHBUTTON "&Fermer",IDC_FERMER,50,134,50,14 + LTEXT "Nom du jeu :",IDC_STATIC,4,4,41,8 + LTEXT "Code :",IDC_STATIC,4,12,41,8 + LTEXT "Fabriquant :",IDC_STATIC,4,20,41,8 + LTEXT "Taille :",IDC_STATIC,4,28,41,8 + LTEXT "ARM9 taille :",IDC_STATIC,4,36,41,8 + LTEXT "ARM7 taille :",IDC_STATIC,4,44,41,8 + LTEXT "Donnee :",IDC_STATIC,4,52,41,8 + LTEXT "",IDC_NOM_JEU,45,4,100,8 + LTEXT "",IDC_CDE,45,12,100,8 + LTEXT "",IDC_FAB,45,20,100,8 + LTEXT "",IDC_TAILLE,45,28,100,8 + LTEXT "",IDC_ARM9_T,45,36,100,8 + LTEXT "",IDC_ARM7_T,45,44,100,8 + LTEXT "",IDC_DATA,45,52,100,8 +END + +IDD_IO_REG DIALOG DISCARDABLE 0, 0, 150, 150 +STYLE WS_SYSMENU +CAPTION "IO REG" +FONT 8, "MS Sans Serif" +BEGIN + PUSHBUTTON "&Fermer",IDC_FERMER,50,134,50,14 + LTEXT "Int Handler :",IDC_STATIC,4,4,41,8 + LTEXT "IE :",IDC_STATIC,4,12,41,8 + LTEXT "IME :",IDC_STATIC,4,20,41,8 + LTEXT "DISPCNT :",IDC_STATIC,4,28,41,8 + LTEXT "DISPSTAT :",IDC_STATIC,4,36,41,8 + LTEXT "IPCSYNC :",IDC_STATIC,4,44,41,8 + LTEXT "IPCFIFO :",IDC_STATIC,4,52,41,8 + LTEXT "",IDC_INTHAND,45,4,100,8 + LTEXT "",IDC_IE,45,12,130,8 + LTEXT "",IDC_IME,45,20,130,8 + LTEXT "",IDC_DISPCNT,45,28,130,8 + LTEXT "",IDC_DISPSTAT,45,36,130,8 + LTEXT "",IDC_IPCSYNC,45,44,130,8 + LTEXT "",IDC_IPCFIFO,45,52,130,8 +END + +IDD_LOG DIALOG DISCARDABLE 0, 0, 300, 300 +STYLE WS_SYSMENU +CAPTION "Log" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "Edit", IDC_LOG,"LogView",WS_TABSTOP | WS_VSCROLL,4,4,292,280,WS_EX_CLIENTEDGE + PUSHBUTTON "&Fermer",IDC_FERMER,125,285,50,14 +END + +IDD_PAL DIALOG DISCARDABLE 0, 0, 120, 165 +STYLE WS_SYSMENU +CAPTION "PAL VIEW" +FONT 8, "MS Sans Serif" +BEGIN + COMBOBOX IDC_PAL_SELECT, 15, 3, 90, 14, WS_TABSTOP | CBS_DROPDOWN + LTEXT "Pal : 0",IDC_PALNUM,3,21,25,8 + SCROLLBAR IDC_SCROLLER,30,18,20,14, SBS_HORZ + CONTROL "Auto-update",IDC_AUTO_UPDATE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,60,18,75,14 + PUSHBUTTON "&Fermer",IDC_FERMER,35,149,50,14 +END + +IDD_TILE DIALOG DISCARDABLE 0, 0, 446, 180 +STYLE WS_SYSMENU +CAPTION "TILE VIEW" +FONT 8, "MS Sans Serif" +BEGIN + COMBOBOX IDC_PAL_SELECT, 4, 13, 90, 14, WS_TABSTOP | CBS_DROPDOWN + LTEXT "Pal : 0",IDC_PALNUM,4,31,25,8 + SCROLLBAR IDC_SCROLLER,30,28,20,14, SBS_HORZ + COMBOBOX IDC_MEM_SELECT, 4, 50, 90, 14, WS_TABSTOP | CBS_DROPDOWN + CONTROL "Bitmap",IDC_BITMAP,"Button",BS_AUTORADIOBUTTON | WS_GROUP,4,68,35,10 + CONTROL "256 couleurs",IDC_256COUL,"Button",BS_AUTORADIOBUTTON,4,80,55,10 + CONTROL "16 couleurs",IDC_16COUL,"Button",BS_AUTORADIOBUTTON,4,92,50,10 + CONTROL "Auto-update",IDC_AUTO_UPDATE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,369,164,75,14 + CONTROL "Edit", IDC_Tile_BOX,"TileViewBox",WS_TABSTOP ,100,2,344,160,WS_EX_CLIENTEDGE + CONTROL "Edit", IDC_MINI_TILE,"MiniTileViewBox",WS_TABSTOP ,22,116,56,52,WS_EX_CLIENTEDGE + LTEXT "Tile num : 0",IDC_TILENUM,23,170,100,8 + PUSHBUTTON "&Fermer",IDC_FERMER,198,164,50,14 +END + +IDD_MAP DIALOG DISCARDABLE 0, 0, 485, 320 +STYLE WS_SYSMENU +CAPTION "MAP VIEW" +FONT 8, "MS Sans Serif" +BEGIN + COMBOBOX IDC_BG_SELECT, 4, 4, 90, 14, WS_TABSTOP | CBS_DROPDOWN + LTEXT "Mode :",IDC_STATIC,4,20,45,8 + LTEXT "Palette :",IDC_STATIC,4,30,45,8 + LTEXT "Prio :",IDC_STATIC,4,40,45,8 + LTEXT "Char base :",IDC_STATIC,4,50,45,8 + LTEXT "Screen base :",IDC_STATIC,4,60,45,8 + LTEXT "Size :",IDC_STATIC,4,70,45,8 + LTEXT "Scroll :",IDC_STATIC,4,80,45,8 + LTEXT "",IDC_MODE,48,20,85,8 + LTEXT "",IDC_PAL,48,30,85,8 + LTEXT "",IDC_PRIO,48,40,85,8 + LTEXT "",IDC_CHAR,48,50,85,8 + LTEXT "",IDC_SCR,48,60,85,8 + LTEXT "",IDC_MSIZE,48,70,85,8 + LTEXT "",IDC_SCROLL,48,80,85,8 +// CONTROL "Edit", IDC_MAP_BOX,"MapViewBox",WS_TABSTOP | WS_VSCROLL | WS_HSCROLL,4,16,296,150,WS_EX_CLIENTEDGE + PUSHBUTTON "&Fermer",IDC_FERMER,4,300,50,14 +END + +IDD_OAM DIALOG DISCARDABLE 0, 0, 300, 200//150, 150 +STYLE WS_SYSMENU +CAPTION "OAM Viewer" +FONT 8, "MS Sans Serif" +BEGIN + COMBOBOX IDC_SCR_SELECT, 4, 4, 90, 14, WS_TABSTOP | CBS_DROPDOWN + SCROLLBAR IDC_SCROLLER,48,20,20,14, SBS_HORZ + LTEXT "Mode :",IDC_STATIC,4,36,45,8 + LTEXT "Tile :",IDC_STATIC,4,46,45,8 + LTEXT "Palette :",IDC_STATIC,4,56,45,8 + LTEXT "Prio :",IDC_STATIC,4,66,45,8 + LTEXT "Coordonnées :",IDC_STATIC,4,76,45,8 + LTEXT "Dimensions :",IDC_STATIC,4,86,45,8 + LTEXT "Rotation :",IDC_STATIC,4,96,45,8 + LTEXT "Mosaic :",IDC_STATIC,4,106,45,8 + LTEXT "OAM : 0",IDC_OAMNUM,4,24,40,8 + LTEXT "",IDC_MODE,48,36,42,8 + LTEXT "",IDC_TILE,48,46,72,8 + LTEXT "",IDC_PAL,48,56,72,8 + LTEXT "",IDC_PRIO,48,66,72,8 + LTEXT "",IDC_COOR,48,76,42,8 + LTEXT "",IDC_DIM,48,86,42,8 + LTEXT "",IDC_ROT,48,96,42,8 + LTEXT "",IDC_MOS,48,106,42,8 + LTEXT "",IDC_PROP0,4,116,86,8 + LTEXT "",IDC_PROP1,4,126,86,8 +// CONTROL "Edit", IDC_OAM_BOX,"OAMViewBox",WS_TABSTOP,100,50,45,42,WS_EX_CLIENTEDGE + PUSHBUTTON "&Fermer",IDC_FERMER,50,134,50,14 +END + + + diff --git a/desmume/src/windows/yopyop_private.rc b/desmume/src/windows/yopyop_private.rc new file mode 100644 index 000000000..8e964fb51 --- /dev/null +++ b/desmume/src/windows/yopyop_private.rc @@ -0,0 +1,43 @@ +/* THIS FILE WILL BE OVERWRITTEN BY DEV-C++ */ +/* DO NOT EDIT! */ + +#include // include for version info constants + +#include "resources.rc" + +// +// SUPPORT FOR WINDOWS XP THEMES: +// THIS WILL MAKE THE PROGRAM USE THE COMMON CONTROLS +// LIBRARY VERSION 6.0 (IF IT IS AVAILABLE) +// +1 24 "DeSmuME.exe.Manifest" + +// +// TO CHANGE VERSION INFORMATION, EDIT PROJECT OPTIONS... +// +1 VERSIONINFO +FILEVERSION 0,0,0,1 +PRODUCTVERSION 0,0,0,1 +FILETYPE VFT_APP +{ + BLOCK "StringFileInfo" + { + BLOCK "040C04E4" + { + VALUE "CompanyName", "yopyop" + VALUE "FileVersion", "" + VALUE "FileDescription", "NDS(tm) emulator" + VALUE "InternalName", "" + VALUE "LegalCopyright", "" + VALUE "LegalTrademarks", "" + VALUE "OriginalFilename", "" + VALUE "ProductName", "DeSmuME" + VALUE "ProductVersion", "" + } + } + BLOCK "VarFileInfo" + { + VALUE "Translation", 0x040C, 1252 + } +} +