From 432170a3c338eb3ab3b97ccb00f58dc9633bcb09 Mon Sep 17 00:00:00 2001 From: yabause Date: Tue, 30 Dec 2008 14:37:44 +0000 Subject: [PATCH] Re-creating the release branch from r1302. --- desmume/AUTHORS => AUTHORS | 0 desmume/COPYING => COPYING | 0 desmume/ChangeLog => ChangeLog | 0 desmume/INSTALL => INSTALL | 0 desmume/Makefile.am => Makefile.am | 0 desmume/NEWS => NEWS | 0 desmume/README => README | 0 desmume/README.LIN => README.LIN | 0 desmume/README.MAC => README.MAC | 0 .../README.TRANSLATION => README.TRANSLATION | 0 desmume/README.WIN => README.WIN | 0 desmume/TODO => TODO | 0 desmume/autogen.sh => autogen.sh | 0 .../default.apspec.in | 0 desmume/compile => compile | 0 desmume/configure.ac => configure.ac | 0 {desmume/po => po}/ChangeLog | 0 {desmume/po => po}/LINGUAS | 0 {desmume/po => po}/PACKAGE | 0 {desmume/po => po}/POTFILES.in | 0 {desmume/po => po}/desmume.pot | 0 {desmume/po => po}/fr.po | 0 {desmume/po => po}/pt_BR.po | 0 {desmume/po => po}/sv.po | 0 {desmume/src => src}/ARM9.h | 4 +- {desmume/src => src}/Disassembler.cpp | 0 {desmume/src => src}/Disassembler.h | 0 {desmume/src => src}/FIFO.cpp | 0 {desmume/src => src}/FIFO.h | 0 {desmume/src => src}/GPU.cpp | 356 ++---------------- {desmume/src => src}/GPU.h | 9 +- {desmume/src => src}/GPU_osd.cpp | 0 {desmume/src => src}/GPU_osd.h | 0 {desmume/src => src}/MMU.cpp | 0 {desmume/src => src}/MMU.h | 0 {desmume/src => src}/Makefile.am | 0 {desmume/src => src}/NDSSystem.cpp | 0 {desmume/src => src}/NDSSystem.h | 0 {desmume/src => src}/OGLRender.cpp | 42 +-- {desmume/src => src}/OGLRender.h | 0 {desmume/src => src}/PACKED.h | 0 {desmume/src => src}/PACKED_END.h | 0 {desmume/src => src}/ROMReader.cpp | 0 {desmume/src => src}/ROMReader.h | 0 {desmume/src => src}/SPU.cpp | 0 {desmume/src => src}/SPU.h | 0 {desmume/src => src}/arm_instructions.cpp | 0 {desmume/src => src}/arm_instructions.h | 0 {desmume/src => src}/armcpu.cpp | 0 {desmume/src => src}/armcpu.h | 0 {desmume/src => src}/bios.cpp | 0 {desmume/src => src}/bios.h | 0 {desmume/src => src}/bits.h | 0 {desmume/src => src}/build.bat | 0 {desmume/src => src}/cflash.cpp | 0 {desmume/src => src}/cflash.h | 0 {desmume/src => src}/cli/Makefile.am | 0 {desmume/src => src}/cli/doc/Makefile.am | 0 {desmume/src => src}/cli/doc/desmume-cli.1 | 0 {desmume/src => src}/cli/main.cpp | 0 {desmume/src => src}/cocoa/DeSmuME.cbp | 0 {desmume/src => src}/cocoa/DeSmuME.icns | Bin .../cocoa/DeSmuME.xcodeproj/project.pbxproj | 0 .../src => src}/cocoa/English.nib/classes.nib | 0 .../src => src}/cocoa/English.nib/info.nib | 0 .../cocoa/English.nib/keyedobjects.nib | Bin {desmume/src => src}/cocoa/English.strings | Bin .../src => src}/cocoa/French.nib/classes.nib | 0 .../src => src}/cocoa/French.nib/info.nib | 0 .../cocoa/French.nib/keyedobjects.nib | Bin {desmume/src => src}/cocoa/French.strings | 0 {desmume/src => src}/cocoa/Info.plist | 0 {desmume/src => src}/cocoa/InfoPlist.strings | Bin .../cocoa/Japanese.nib/classes.nib | 0 .../src => src}/cocoa/Japanese.nib/info.nib | 0 .../cocoa/Japanese.nib/keyedobjects.nib | Bin {desmume/src => src}/cocoa/Japanese.strings | Bin {desmume/src => src}/cocoa/Makefile.am | 0 {desmume/src => src}/cocoa/PkgInfo | 0 {desmume/src => src}/cocoa/Rakefile | 0 {desmume/src => src}/cocoa/about.m | 0 {desmume/src => src}/cocoa/cocoa_util.m | 0 {desmume/src => src}/cocoa/dialogs/rom_info.h | 0 {desmume/src => src}/cocoa/dialogs/rom_info.m | 0 .../dialogs/speed_limit_selection_window.h | 0 .../dialogs/speed_limit_selection_window.m | 0 {desmume/src => src}/cocoa/globals.h | 0 {desmume/src => src}/cocoa/input.h | 0 {desmume/src => src}/cocoa/input.m | 0 {desmume/src => src}/cocoa/main.m | 0 {desmume/src => src}/cocoa/main_window.h | 0 {desmume/src => src}/cocoa/main_window.m | 0 {desmume/src => src}/cocoa/makeapp.sh | 0 {desmume/src => src}/cocoa/nds_control.h | 0 {desmume/src => src}/cocoa/nds_control.mm | 0 {desmume/src => src}/cocoa/preferences.h | 0 {desmume/src => src}/cocoa/preferences.m | 0 {desmume/src => src}/cocoa/screen_state.h | 0 {desmume/src => src}/cocoa/screen_state.m | 0 {desmume/src => src}/cocoa/screenshot.h | 0 {desmume/src => src}/cocoa/screenshot.m | 0 {desmume/src => src}/cocoa/sndOSX.h | 0 {desmume/src => src}/cocoa/sndOSX.mm | 0 .../src => src}/cocoa/video_output_view.h | 0 .../src => src}/cocoa/video_output_view.m | 0 {desmume/src => src}/common.cpp | 0 {desmume/src => src}/common.h | 0 {desmume/src => src}/cp15.cpp | 0 {desmume/src => src}/cp15.h | 0 {desmume/src => src}/ctrlssdl.cpp | 0 {desmume/src => src}/ctrlssdl.h | 0 {desmume/src => src}/debug.cpp | 0 {desmume/src => src}/debug.h | 0 {desmume/src => src}/desmume.mk | 0 {desmume/src => src}/dscard.h | 0 {desmume/src => src}/fat.h | 0 {desmume/src => src}/fs-linux.cpp | 0 {desmume/src => src}/fs-windows.cpp | 0 {desmume/src => src}/fs.h | 0 {desmume/src => src}/gdbstub.h | 0 {desmume/src => src}/gdbstub/Makefile.am | 0 {desmume/src => src}/gdbstub/gdbstub.cpp | 0 .../src => src}/gdbstub/gdbstub_internal.h | 0 {desmume/src => src}/gfx3d.cpp | 0 {desmume/src => src}/gfx3d.h | 0 {desmume/src => src}/gtk-glade/Makefile.am | 0 {desmume/src => src}/gtk-glade/callbacks.cpp | 0 {desmume/src => src}/gtk-glade/callbacks.h | 0 .../src => src}/gtk-glade/callbacks_IO.cpp | 0 {desmume/src => src}/gtk-glade/callbacks_IO.h | 0 .../gtk-glade/dTools/callbacks_1_ioregs.cpp | 0 .../gtk-glade/dTools/callbacks_2_memview.cpp | 0 .../gtk-glade/dTools/callbacks_3_palview.cpp | 0 .../gtk-glade/dTools/callbacks_4_tileview.cpp | 0 .../gtk-glade/dTools/callbacks_dtools.h | 0 .../gtk-glade/dTools/dTools_display.h | 0 .../gtk-glade/desmume-glade.desktop | 0 {desmume/src => src}/gtk-glade/desmume.cpp | 0 {desmume/src => src}/gtk-glade/desmume.h | 0 .../src => src}/gtk-glade/doc/Makefile.am | 0 .../src => src}/gtk-glade/doc/desmume-glade.1 | 0 {desmume/src => src}/gtk-glade/gdk_3Demu.cpp | 0 {desmume/src => src}/gtk-glade/gdk_3Demu.h | 0 {desmume/src => src}/gtk-glade/gdk_gl.cpp | 0 {desmume/src => src}/gtk-glade/gdk_gl.h | 0 {desmume/src => src}/gtk-glade/glade-xml.cpp | 0 .../src => src}/gtk-glade/glade/DeSmuME.xpm | 0 .../src => src}/gtk-glade/glade/DeSmuMe.glade | 0 .../gtk-glade/glade/DeSmuMe_Dtools.glade | 0 {desmume/src => src}/gtk-glade/globals.h | 0 .../src => src}/gtk-glade/keyval_names.cpp | 0 {desmume/src => src}/gtk-glade/keyval_names.h | 0 {desmume/src => src}/gtk-glade/main.cpp | 0 {desmume/src => src}/gtk/DeSmuME.xpm | 0 {desmume/src => src}/gtk/Makefile.am | 0 {desmume/src => src}/gtk/dTool.h | 0 {desmume/src => src}/gtk/dToolsList.cpp | 0 {desmume/src => src}/gtk/desmume.cpp | 0 {desmume/src => src}/gtk/desmume.desktop | 0 {desmume/src => src}/gtk/desmume.h | 0 {desmume/src => src}/gtk/doc/Makefile.am | 0 {desmume/src => src}/gtk/doc/desmume.1 | 0 {desmume/src => src}/gtk/gdk_3Demu.cpp | 0 {desmume/src => src}/gtk/gdk_3Demu.h | 0 {desmume/src => src}/gtk/main.cpp | 0 {desmume/src => src}/gtk/tools/ioregsView.cpp | 0 {desmume/src => src}/gtk/tools/ioregsView.h | 0 {desmume/src => src}/instruction_tabdef.inc | 0 {desmume/src => src}/matrix.cpp | 0 {desmume/src => src}/matrix.h | 0 {desmume/src => src}/matrix_sse2-x64.asm | 0 {desmume/src => src}/matrix_sse2-x86.asm | 0 {desmume/src => src}/mc.cpp | 0 {desmume/src => src}/mc.h | 0 {desmume/src => src}/mem.h | 0 {desmume/src => src}/memorystream.h | 0 {desmume/src => src}/movie.cpp | 0 {desmume/src => src}/movie.h | 0 {desmume/src => src}/readwrite.cpp | 0 {desmume/src => src}/readwrite.h | 0 {desmume/src => src}/registers.h | 0 {desmume/src => src}/render3D.cpp | 2 +- {desmume/src => src}/render3D.h | 2 +- {desmume/src => src}/rtc.cpp | 0 {desmume/src => src}/rtc.h | 0 {desmume/src => src}/saves.cpp | 0 {desmume/src => src}/saves.h | 0 {desmume/src => src}/shaders.h | 0 {desmume/src => src}/sndsdl.cpp | 0 {desmume/src => src}/sndsdl.h | 0 {desmume/src => src}/softrender.cpp | 0 {desmume/src => src}/softrender.h | 0 {desmume/src => src}/softrender_config.h | 0 {desmume/src => src}/softrender_desmumefont.h | 0 {desmume/src => src}/softrender_v3sysfont.h | 0 {desmume/src => src}/thumb_instructions.cpp | 0 {desmume/src => src}/thumb_instructions.h | 0 {desmume/src => src}/thumb_tabdef.inc | 0 {desmume/src => src}/types.h | 0 {desmume/src => src}/utils/ConvertUTF.c | 0 {desmume/src => src}/utils/ConvertUTF.h | 0 {desmume/src => src}/utils/decrypt/crc.cpp | 0 {desmume/src => src}/utils/decrypt/crc.h | 0 .../src => src}/utils/decrypt/decrypt.cpp | 0 {desmume/src => src}/utils/decrypt/decrypt.h | 0 {desmume/src => src}/utils/decrypt/header.cpp | 0 {desmume/src => src}/utils/decrypt/header.h | 0 {desmume/src => src}/utils/guid.cpp | 0 {desmume/src => src}/utils/guid.h | 0 {desmume/src => src}/utils/md5.cpp | 0 {desmume/src => src}/utils/md5.h | 0 {desmume/src => src}/utils/valuearray.h | 0 {desmume/src => src}/utils/xstring.cpp | 0 {desmume/src => src}/utils/xstring.h | 0 {desmume/src => src}/wifi.cpp | 0 {desmume/src => src}/wifi.h | 0 {desmume/src => src}/windows/AboutBox.cpp | 0 {desmume/src => src}/windows/AboutBox.h | 0 {desmume/src => src}/windows/CWindow.cpp | 0 {desmume/src => src}/windows/CWindow.h | 0 {desmume/src => src}/windows/DeSmuME.ico | Bin {desmume/src => src}/windows/DeSmuME.layout | 0 .../src => src}/windows/DeSmuME_2005.vcproj | 0 .../src => src}/windows/DeSmuME_2008.vcproj | 0 .../src => src}/windows/DeSmuME_Intel.icproj | 0 .../src => src}/windows/DeSmuME_Intel.vcproj | 0 .../src => src}/windows/DeSmuME_x64.manifest | 0 .../src => src}/windows/DeSmuME_x86.manifest | 0 {desmume/src => src}/windows/FirmConfig.cpp | 0 {desmume/src => src}/windows/FirmConfig.h | 0 {desmume/src => src}/windows/GL/glext.h | 0 {desmume/src => src}/windows/IORegView.cpp | 0 {desmume/src => src}/windows/IORegView.h | 0 {desmume/src => src}/windows/Makefile.am | 0 {desmume/src => src}/windows/Makefile.win | 0 {desmume/src => src}/windows/afxres.h | 0 {desmume/src => src}/windows/aviout.cpp | 0 {desmume/src => src}/windows/colorctrl.cpp | 0 {desmume/src => src}/windows/colorctrl.h | 0 {desmume/src => src}/windows/console.cpp | 0 {desmume/src => src}/windows/console.h | 0 .../src => src}/windows/directx/DxErr8.lib | Bin {desmume/src => src}/windows/directx/ddraw.h | 0 .../src => src}/windows/directx/ddraw.lib | Bin {desmume/src => src}/windows/directx/dinput.h | 0 .../src => src}/windows/directx/dinput8.lib | Bin {desmume/src => src}/windows/directx/dsound.h | 0 .../src => src}/windows/directx/dsound.lib | Bin {desmume/src => src}/windows/directx/dxerr8.h | 0 .../src => src}/windows/directx/dxguid.lib | Bin {desmume/src => src}/windows/disView.cpp | 0 {desmume/src => src}/windows/disView.h | 0 {desmume/src => src}/windows/ginfo.cpp | 0 {desmume/src => src}/windows/ginfo.h | 0 {desmume/src => src}/windows/inputdx.cpp | 0 {desmume/src => src}/windows/inputdx.h | 0 {desmume/src => src}/windows/lightView.cpp | 0 {desmume/src => src}/windows/lightView.h | 0 {desmume/src => src}/windows/main.cpp | 0 {desmume/src => src}/windows/mapView.cpp | 0 {desmume/src => src}/windows/mapView.h | 0 {desmume/src => src}/windows/matrixView.cpp | 0 {desmume/src => src}/windows/matrixView.h | 0 {desmume/src => src}/windows/memView.cpp | 0 {desmume/src => src}/windows/memView.h | 0 {desmume/src => src}/windows/oamView.cpp | 0 {desmume/src => src}/windows/oamView.h | 0 {desmume/src => src}/windows/ogl.cpp | 0 {desmume/src => src}/windows/palView.cpp | 0 {desmume/src => src}/windows/palView.h | 0 {desmume/src => src}/windows/resource.h | 0 {desmume/src => src}/windows/resources.rc | 0 {desmume/src => src}/windows/snddx.cpp | 0 {desmume/src => src}/windows/snddx.h | 0 {desmume/src => src}/windows/throttle.cpp | 0 {desmume/src => src}/windows/throttle.h | 0 {desmume/src => src}/windows/tileView.cpp | 0 {desmume/src => src}/windows/tileView.h | 0 {desmume/src => src}/windows/windriver.h | 0 {desmume/src => src}/windows/zlib123/README | 0 {desmume/src => src}/windows/zlib123/zconf.h | 0 .../windows/zlib123/zlib-2005-x32.lib | Bin .../windows/zlib123/zlib-2005-x64.lib | Bin .../windows/zlib123/zlib-2008-x32.lib | Bin .../windows/zlib123/zlib-2008-x64.lib | Bin {desmume/src => src}/windows/zlib123/zlib.h | 0 {desmume/src => src}/windows/zlib123/zutil.h | 0 {desmume/src => src}/windows/zziplib/README | 0 .../src => src}/windows/zziplib/zzip/_msvc.h | 0 .../src => src}/windows/zziplib/zzip/conf.h | 0 .../src => src}/windows/zziplib/zzip/types.h | 0 .../src => src}/windows/zziplib/zzip/zzip.h | 0 .../windows/zziplib/zziplib-2005-x32.lib | Bin .../windows/zziplib/zziplib-2005-x64.lib | Bin .../windows/zziplib/zziplib-2008-x32.lib | Bin .../windows/zziplib/zziplib-2008-x64.lib | Bin {desmume/src => src}/zero_private.h | 0 297 files changed, 62 insertions(+), 353 deletions(-) rename desmume/AUTHORS => AUTHORS (100%) rename desmume/COPYING => COPYING (100%) rename desmume/ChangeLog => ChangeLog (100%) rename desmume/INSTALL => INSTALL (100%) rename desmume/Makefile.am => Makefile.am (100%) rename desmume/NEWS => NEWS (100%) rename desmume/README => README (100%) rename desmume/README.LIN => README.LIN (100%) rename desmume/README.MAC => README.MAC (100%) rename desmume/README.TRANSLATION => README.TRANSLATION (100%) rename desmume/README.WIN => README.WIN (100%) rename desmume/TODO => TODO (100%) rename desmume/autogen.sh => autogen.sh (100%) rename {desmume/autopackage => autopackage}/default.apspec.in (100%) rename desmume/compile => compile (100%) rename desmume/configure.ac => configure.ac (100%) rename {desmume/po => po}/ChangeLog (100%) rename {desmume/po => po}/LINGUAS (100%) rename {desmume/po => po}/PACKAGE (100%) rename {desmume/po => po}/POTFILES.in (100%) rename {desmume/po => po}/desmume.pot (100%) rename {desmume/po => po}/fr.po (100%) rename {desmume/po => po}/pt_BR.po (100%) rename {desmume/po => po}/sv.po (100%) rename {desmume/src => src}/ARM9.h (93%) rename {desmume/src => src}/Disassembler.cpp (100%) rename {desmume/src => src}/Disassembler.h (100%) rename {desmume/src => src}/FIFO.cpp (100%) rename {desmume/src => src}/FIFO.h (100%) rename {desmume/src => src}/GPU.cpp (84%) rename {desmume/src => src}/GPU.h (95%) rename {desmume/src => src}/GPU_osd.cpp (100%) rename {desmume/src => src}/GPU_osd.h (100%) rename {desmume/src => src}/MMU.cpp (100%) rename {desmume/src => src}/MMU.h (100%) rename {desmume/src => src}/Makefile.am (100%) rename {desmume/src => src}/NDSSystem.cpp (100%) rename {desmume/src => src}/NDSSystem.h (100%) rename {desmume/src => src}/OGLRender.cpp (93%) rename {desmume/src => src}/OGLRender.h (100%) rename {desmume/src => src}/PACKED.h (100%) rename {desmume/src => src}/PACKED_END.h (100%) rename {desmume/src => src}/ROMReader.cpp (100%) rename {desmume/src => src}/ROMReader.h (100%) rename {desmume/src => src}/SPU.cpp (100%) rename {desmume/src => src}/SPU.h (100%) rename {desmume/src => src}/arm_instructions.cpp (100%) rename {desmume/src => src}/arm_instructions.h (100%) rename {desmume/src => src}/armcpu.cpp (100%) rename {desmume/src => src}/armcpu.h (100%) rename {desmume/src => src}/bios.cpp (100%) rename {desmume/src => src}/bios.h (100%) rename {desmume/src => src}/bits.h (100%) rename {desmume/src => src}/build.bat (100%) rename {desmume/src => src}/cflash.cpp (100%) rename {desmume/src => src}/cflash.h (100%) rename {desmume/src => src}/cli/Makefile.am (100%) rename {desmume/src => src}/cli/doc/Makefile.am (100%) rename {desmume/src => src}/cli/doc/desmume-cli.1 (100%) rename {desmume/src => src}/cli/main.cpp (100%) rename {desmume/src => src}/cocoa/DeSmuME.cbp (100%) rename {desmume/src => src}/cocoa/DeSmuME.icns (100%) rename {desmume/src => src}/cocoa/DeSmuME.xcodeproj/project.pbxproj (100%) rename {desmume/src => src}/cocoa/English.nib/classes.nib (100%) rename {desmume/src => src}/cocoa/English.nib/info.nib (100%) rename {desmume/src => src}/cocoa/English.nib/keyedobjects.nib (100%) rename {desmume/src => src}/cocoa/English.strings (100%) rename {desmume/src => src}/cocoa/French.nib/classes.nib (100%) rename {desmume/src => src}/cocoa/French.nib/info.nib (100%) rename {desmume/src => src}/cocoa/French.nib/keyedobjects.nib (100%) rename {desmume/src => src}/cocoa/French.strings (100%) rename {desmume/src => src}/cocoa/Info.plist (100%) rename {desmume/src => src}/cocoa/InfoPlist.strings (100%) rename {desmume/src => src}/cocoa/Japanese.nib/classes.nib (100%) rename {desmume/src => src}/cocoa/Japanese.nib/info.nib (100%) rename {desmume/src => src}/cocoa/Japanese.nib/keyedobjects.nib (100%) rename {desmume/src => src}/cocoa/Japanese.strings (100%) rename {desmume/src => src}/cocoa/Makefile.am (100%) rename {desmume/src => src}/cocoa/PkgInfo (100%) rename {desmume/src => src}/cocoa/Rakefile (100%) rename {desmume/src => src}/cocoa/about.m (100%) rename {desmume/src => src}/cocoa/cocoa_util.m (100%) rename {desmume/src => src}/cocoa/dialogs/rom_info.h (100%) rename {desmume/src => src}/cocoa/dialogs/rom_info.m (100%) rename {desmume/src => src}/cocoa/dialogs/speed_limit_selection_window.h (100%) rename {desmume/src => src}/cocoa/dialogs/speed_limit_selection_window.m (100%) rename {desmume/src => src}/cocoa/globals.h (100%) rename {desmume/src => src}/cocoa/input.h (100%) rename {desmume/src => src}/cocoa/input.m (100%) rename {desmume/src => src}/cocoa/main.m (100%) rename {desmume/src => src}/cocoa/main_window.h (100%) rename {desmume/src => src}/cocoa/main_window.m (100%) rename {desmume/src => src}/cocoa/makeapp.sh (100%) rename {desmume/src => src}/cocoa/nds_control.h (100%) rename {desmume/src => src}/cocoa/nds_control.mm (100%) rename {desmume/src => src}/cocoa/preferences.h (100%) rename {desmume/src => src}/cocoa/preferences.m (100%) rename {desmume/src => src}/cocoa/screen_state.h (100%) rename {desmume/src => src}/cocoa/screen_state.m (100%) rename {desmume/src => src}/cocoa/screenshot.h (100%) rename {desmume/src => src}/cocoa/screenshot.m (100%) rename {desmume/src => src}/cocoa/sndOSX.h (100%) rename {desmume/src => src}/cocoa/sndOSX.mm (100%) rename {desmume/src => src}/cocoa/video_output_view.h (100%) rename {desmume/src => src}/cocoa/video_output_view.m (100%) rename {desmume/src => src}/common.cpp (100%) rename {desmume/src => src}/common.h (100%) rename {desmume/src => src}/cp15.cpp (100%) rename {desmume/src => src}/cp15.h (100%) rename {desmume/src => src}/ctrlssdl.cpp (100%) rename {desmume/src => src}/ctrlssdl.h (100%) rename {desmume/src => src}/debug.cpp (100%) rename {desmume/src => src}/debug.h (100%) rename {desmume/src => src}/desmume.mk (100%) rename {desmume/src => src}/dscard.h (100%) rename {desmume/src => src}/fat.h (100%) rename {desmume/src => src}/fs-linux.cpp (100%) rename {desmume/src => src}/fs-windows.cpp (100%) rename {desmume/src => src}/fs.h (100%) rename {desmume/src => src}/gdbstub.h (100%) rename {desmume/src => src}/gdbstub/Makefile.am (100%) rename {desmume/src => src}/gdbstub/gdbstub.cpp (100%) rename {desmume/src => src}/gdbstub/gdbstub_internal.h (100%) rename {desmume/src => src}/gfx3d.cpp (100%) rename {desmume/src => src}/gfx3d.h (100%) rename {desmume/src => src}/gtk-glade/Makefile.am (100%) rename {desmume/src => src}/gtk-glade/callbacks.cpp (100%) rename {desmume/src => src}/gtk-glade/callbacks.h (100%) rename {desmume/src => src}/gtk-glade/callbacks_IO.cpp (100%) rename {desmume/src => src}/gtk-glade/callbacks_IO.h (100%) rename {desmume/src => src}/gtk-glade/dTools/callbacks_1_ioregs.cpp (100%) rename {desmume/src => src}/gtk-glade/dTools/callbacks_2_memview.cpp (100%) rename {desmume/src => src}/gtk-glade/dTools/callbacks_3_palview.cpp (100%) rename {desmume/src => src}/gtk-glade/dTools/callbacks_4_tileview.cpp (100%) rename {desmume/src => src}/gtk-glade/dTools/callbacks_dtools.h (100%) rename {desmume/src => src}/gtk-glade/dTools/dTools_display.h (100%) rename {desmume/src => src}/gtk-glade/desmume-glade.desktop (100%) rename {desmume/src => src}/gtk-glade/desmume.cpp (100%) rename {desmume/src => src}/gtk-glade/desmume.h (100%) rename {desmume/src => src}/gtk-glade/doc/Makefile.am (100%) rename {desmume/src => src}/gtk-glade/doc/desmume-glade.1 (100%) rename {desmume/src => src}/gtk-glade/gdk_3Demu.cpp (100%) rename {desmume/src => src}/gtk-glade/gdk_3Demu.h (100%) rename {desmume/src => src}/gtk-glade/gdk_gl.cpp (100%) rename {desmume/src => src}/gtk-glade/gdk_gl.h (100%) rename {desmume/src => src}/gtk-glade/glade-xml.cpp (100%) rename {desmume/src => src}/gtk-glade/glade/DeSmuME.xpm (100%) rename {desmume/src => src}/gtk-glade/glade/DeSmuMe.glade (100%) rename {desmume/src => src}/gtk-glade/glade/DeSmuMe_Dtools.glade (100%) rename {desmume/src => src}/gtk-glade/globals.h (100%) rename {desmume/src => src}/gtk-glade/keyval_names.cpp (100%) rename {desmume/src => src}/gtk-glade/keyval_names.h (100%) rename {desmume/src => src}/gtk-glade/main.cpp (100%) rename {desmume/src => src}/gtk/DeSmuME.xpm (100%) rename {desmume/src => src}/gtk/Makefile.am (100%) rename {desmume/src => src}/gtk/dTool.h (100%) rename {desmume/src => src}/gtk/dToolsList.cpp (100%) rename {desmume/src => src}/gtk/desmume.cpp (100%) rename {desmume/src => src}/gtk/desmume.desktop (100%) rename {desmume/src => src}/gtk/desmume.h (100%) rename {desmume/src => src}/gtk/doc/Makefile.am (100%) rename {desmume/src => src}/gtk/doc/desmume.1 (100%) rename {desmume/src => src}/gtk/gdk_3Demu.cpp (100%) rename {desmume/src => src}/gtk/gdk_3Demu.h (100%) rename {desmume/src => src}/gtk/main.cpp (100%) rename {desmume/src => src}/gtk/tools/ioregsView.cpp (100%) rename {desmume/src => src}/gtk/tools/ioregsView.h (100%) rename {desmume/src => src}/instruction_tabdef.inc (100%) rename {desmume/src => src}/matrix.cpp (100%) rename {desmume/src => src}/matrix.h (100%) rename {desmume/src => src}/matrix_sse2-x64.asm (100%) rename {desmume/src => src}/matrix_sse2-x86.asm (100%) rename {desmume/src => src}/mc.cpp (100%) rename {desmume/src => src}/mc.h (100%) rename {desmume/src => src}/mem.h (100%) rename {desmume/src => src}/memorystream.h (100%) rename {desmume/src => src}/movie.cpp (100%) rename {desmume/src => src}/movie.h (100%) rename {desmume/src => src}/readwrite.cpp (100%) rename {desmume/src => src}/readwrite.h (100%) rename {desmume/src => src}/registers.h (100%) rename {desmume/src => src}/render3D.cpp (95%) rename {desmume/src => src}/render3D.h (96%) rename {desmume/src => src}/rtc.cpp (100%) rename {desmume/src => src}/rtc.h (100%) rename {desmume/src => src}/saves.cpp (100%) rename {desmume/src => src}/saves.h (100%) rename {desmume/src => src}/shaders.h (100%) rename {desmume/src => src}/sndsdl.cpp (100%) rename {desmume/src => src}/sndsdl.h (100%) rename {desmume/src => src}/softrender.cpp (100%) rename {desmume/src => src}/softrender.h (100%) rename {desmume/src => src}/softrender_config.h (100%) rename {desmume/src => src}/softrender_desmumefont.h (100%) rename {desmume/src => src}/softrender_v3sysfont.h (100%) rename {desmume/src => src}/thumb_instructions.cpp (100%) rename {desmume/src => src}/thumb_instructions.h (100%) rename {desmume/src => src}/thumb_tabdef.inc (100%) rename {desmume/src => src}/types.h (100%) rename {desmume/src => src}/utils/ConvertUTF.c (100%) rename {desmume/src => src}/utils/ConvertUTF.h (100%) rename {desmume/src => src}/utils/decrypt/crc.cpp (100%) rename {desmume/src => src}/utils/decrypt/crc.h (100%) rename {desmume/src => src}/utils/decrypt/decrypt.cpp (100%) rename {desmume/src => src}/utils/decrypt/decrypt.h (100%) rename {desmume/src => src}/utils/decrypt/header.cpp (100%) rename {desmume/src => src}/utils/decrypt/header.h (100%) rename {desmume/src => src}/utils/guid.cpp (100%) rename {desmume/src => src}/utils/guid.h (100%) rename {desmume/src => src}/utils/md5.cpp (100%) rename {desmume/src => src}/utils/md5.h (100%) rename {desmume/src => src}/utils/valuearray.h (100%) rename {desmume/src => src}/utils/xstring.cpp (100%) rename {desmume/src => src}/utils/xstring.h (100%) rename {desmume/src => src}/wifi.cpp (100%) rename {desmume/src => src}/wifi.h (100%) rename {desmume/src => src}/windows/AboutBox.cpp (100%) rename {desmume/src => src}/windows/AboutBox.h (100%) rename {desmume/src => src}/windows/CWindow.cpp (100%) rename {desmume/src => src}/windows/CWindow.h (100%) rename {desmume/src => src}/windows/DeSmuME.ico (100%) rename {desmume/src => src}/windows/DeSmuME.layout (100%) rename {desmume/src => src}/windows/DeSmuME_2005.vcproj (100%) rename {desmume/src => src}/windows/DeSmuME_2008.vcproj (100%) rename {desmume/src => src}/windows/DeSmuME_Intel.icproj (100%) rename {desmume/src => src}/windows/DeSmuME_Intel.vcproj (100%) rename {desmume/src => src}/windows/DeSmuME_x64.manifest (100%) rename {desmume/src => src}/windows/DeSmuME_x86.manifest (100%) rename {desmume/src => src}/windows/FirmConfig.cpp (100%) rename {desmume/src => src}/windows/FirmConfig.h (100%) rename {desmume/src => src}/windows/GL/glext.h (100%) rename {desmume/src => src}/windows/IORegView.cpp (100%) rename {desmume/src => src}/windows/IORegView.h (100%) rename {desmume/src => src}/windows/Makefile.am (100%) rename {desmume/src => src}/windows/Makefile.win (100%) rename {desmume/src => src}/windows/afxres.h (100%) rename {desmume/src => src}/windows/aviout.cpp (100%) rename {desmume/src => src}/windows/colorctrl.cpp (100%) rename {desmume/src => src}/windows/colorctrl.h (100%) rename {desmume/src => src}/windows/console.cpp (100%) rename {desmume/src => src}/windows/console.h (100%) rename {desmume/src => src}/windows/directx/DxErr8.lib (100%) rename {desmume/src => src}/windows/directx/ddraw.h (100%) rename {desmume/src => src}/windows/directx/ddraw.lib (100%) rename {desmume/src => src}/windows/directx/dinput.h (100%) rename {desmume/src => src}/windows/directx/dinput8.lib (100%) rename {desmume/src => src}/windows/directx/dsound.h (100%) rename {desmume/src => src}/windows/directx/dsound.lib (100%) rename {desmume/src => src}/windows/directx/dxerr8.h (100%) rename {desmume/src => src}/windows/directx/dxguid.lib (100%) rename {desmume/src => src}/windows/disView.cpp (100%) rename {desmume/src => src}/windows/disView.h (100%) rename {desmume/src => src}/windows/ginfo.cpp (100%) rename {desmume/src => src}/windows/ginfo.h (100%) rename {desmume/src => src}/windows/inputdx.cpp (100%) rename {desmume/src => src}/windows/inputdx.h (100%) rename {desmume/src => src}/windows/lightView.cpp (100%) rename {desmume/src => src}/windows/lightView.h (100%) rename {desmume/src => src}/windows/main.cpp (100%) rename {desmume/src => src}/windows/mapView.cpp (100%) rename {desmume/src => src}/windows/mapView.h (100%) rename {desmume/src => src}/windows/matrixView.cpp (100%) rename {desmume/src => src}/windows/matrixView.h (100%) rename {desmume/src => src}/windows/memView.cpp (100%) rename {desmume/src => src}/windows/memView.h (100%) rename {desmume/src => src}/windows/oamView.cpp (100%) rename {desmume/src => src}/windows/oamView.h (100%) rename {desmume/src => src}/windows/ogl.cpp (100%) rename {desmume/src => src}/windows/palView.cpp (100%) rename {desmume/src => src}/windows/palView.h (100%) rename {desmume/src => src}/windows/resource.h (100%) rename {desmume/src => src}/windows/resources.rc (100%) rename {desmume/src => src}/windows/snddx.cpp (100%) rename {desmume/src => src}/windows/snddx.h (100%) rename {desmume/src => src}/windows/throttle.cpp (100%) rename {desmume/src => src}/windows/throttle.h (100%) rename {desmume/src => src}/windows/tileView.cpp (100%) rename {desmume/src => src}/windows/tileView.h (100%) rename {desmume/src => src}/windows/windriver.h (100%) rename {desmume/src => src}/windows/zlib123/README (100%) rename {desmume/src => src}/windows/zlib123/zconf.h (100%) rename {desmume/src => src}/windows/zlib123/zlib-2005-x32.lib (100%) rename {desmume/src => src}/windows/zlib123/zlib-2005-x64.lib (100%) rename {desmume/src => src}/windows/zlib123/zlib-2008-x32.lib (100%) rename {desmume/src => src}/windows/zlib123/zlib-2008-x64.lib (100%) rename {desmume/src => src}/windows/zlib123/zlib.h (100%) rename {desmume/src => src}/windows/zlib123/zutil.h (100%) rename {desmume/src => src}/windows/zziplib/README (100%) rename {desmume/src => src}/windows/zziplib/zzip/_msvc.h (100%) rename {desmume/src => src}/windows/zziplib/zzip/conf.h (100%) rename {desmume/src => src}/windows/zziplib/zzip/types.h (100%) rename {desmume/src => src}/windows/zziplib/zzip/zzip.h (100%) rename {desmume/src => src}/windows/zziplib/zziplib-2005-x32.lib (100%) rename {desmume/src => src}/windows/zziplib/zziplib-2005-x64.lib (100%) rename {desmume/src => src}/windows/zziplib/zziplib-2008-x32.lib (100%) rename {desmume/src => src}/windows/zziplib/zziplib-2008-x64.lib (100%) rename {desmume/src => src}/zero_private.h (100%) diff --git a/desmume/AUTHORS b/AUTHORS similarity index 100% rename from desmume/AUTHORS rename to AUTHORS diff --git a/desmume/COPYING b/COPYING similarity index 100% rename from desmume/COPYING rename to COPYING diff --git a/desmume/ChangeLog b/ChangeLog similarity index 100% rename from desmume/ChangeLog rename to ChangeLog diff --git a/desmume/INSTALL b/INSTALL similarity index 100% rename from desmume/INSTALL rename to INSTALL diff --git a/desmume/Makefile.am b/Makefile.am similarity index 100% rename from desmume/Makefile.am rename to Makefile.am diff --git a/desmume/NEWS b/NEWS similarity index 100% rename from desmume/NEWS rename to NEWS diff --git a/desmume/README b/README similarity index 100% rename from desmume/README rename to README diff --git a/desmume/README.LIN b/README.LIN similarity index 100% rename from desmume/README.LIN rename to README.LIN diff --git a/desmume/README.MAC b/README.MAC similarity index 100% rename from desmume/README.MAC rename to README.MAC diff --git a/desmume/README.TRANSLATION b/README.TRANSLATION similarity index 100% rename from desmume/README.TRANSLATION rename to README.TRANSLATION diff --git a/desmume/README.WIN b/README.WIN similarity index 100% rename from desmume/README.WIN rename to README.WIN diff --git a/desmume/TODO b/TODO similarity index 100% rename from desmume/TODO rename to TODO diff --git a/desmume/autogen.sh b/autogen.sh similarity index 100% rename from desmume/autogen.sh rename to autogen.sh diff --git a/desmume/autopackage/default.apspec.in b/autopackage/default.apspec.in similarity index 100% rename from desmume/autopackage/default.apspec.in rename to autopackage/default.apspec.in diff --git a/desmume/compile b/compile similarity index 100% rename from desmume/compile rename to compile diff --git a/desmume/configure.ac b/configure.ac similarity index 100% rename from desmume/configure.ac rename to configure.ac diff --git a/desmume/po/ChangeLog b/po/ChangeLog similarity index 100% rename from desmume/po/ChangeLog rename to po/ChangeLog diff --git a/desmume/po/LINGUAS b/po/LINGUAS similarity index 100% rename from desmume/po/LINGUAS rename to po/LINGUAS diff --git a/desmume/po/PACKAGE b/po/PACKAGE similarity index 100% rename from desmume/po/PACKAGE rename to po/PACKAGE diff --git a/desmume/po/POTFILES.in b/po/POTFILES.in similarity index 100% rename from desmume/po/POTFILES.in rename to po/POTFILES.in diff --git a/desmume/po/desmume.pot b/po/desmume.pot similarity index 100% rename from desmume/po/desmume.pot rename to po/desmume.pot diff --git a/desmume/po/fr.po b/po/fr.po similarity index 100% rename from desmume/po/fr.po rename to po/fr.po diff --git a/desmume/po/pt_BR.po b/po/pt_BR.po similarity index 100% rename from desmume/po/pt_BR.po rename to po/pt_BR.po diff --git a/desmume/po/sv.po b/po/sv.po similarity index 100% rename from desmume/po/sv.po rename to po/sv.po diff --git a/desmume/src/ARM9.h b/src/ARM9.h similarity index 93% rename from desmume/src/ARM9.h rename to src/ARM9.h index ced7a1bce..72955330a 100644 --- a/desmume/src/ARM9.h +++ b/src/ARM9.h @@ -3,7 +3,7 @@ #include "types.h" -struct ALIGN(16) ARM9_struct { +typedef ALIGN(16) struct { //ARM9 mem u8 ARM9_ITCM[0x8000]; u8 ARM9_DTCM[0x4000]; @@ -25,7 +25,7 @@ struct ALIGN(16) ARM9_struct { u8 *textureSlotAddr[4]; u8 *blank_memory[0x20000]; -}; +} ARM9_struct; extern ARM9_struct ARM9Mem; diff --git a/desmume/src/Disassembler.cpp b/src/Disassembler.cpp similarity index 100% rename from desmume/src/Disassembler.cpp rename to src/Disassembler.cpp diff --git a/desmume/src/Disassembler.h b/src/Disassembler.h similarity index 100% rename from desmume/src/Disassembler.h rename to src/Disassembler.h diff --git a/desmume/src/FIFO.cpp b/src/FIFO.cpp similarity index 100% rename from desmume/src/FIFO.cpp rename to src/FIFO.cpp diff --git a/desmume/src/FIFO.h b/src/FIFO.h similarity index 100% rename from desmume/src/FIFO.h rename to src/FIFO.h diff --git a/desmume/src/GPU.cpp b/src/GPU.cpp similarity index 84% rename from desmume/src/GPU.cpp rename to src/GPU.cpp index 7baba9c0d..29a514d10 100644 --- a/desmume/src/GPU.cpp +++ b/src/GPU.cpp @@ -139,51 +139,31 @@ NULL }; //static BOOL setFinalColorDirect (const GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y); -static BOOL setFinalBGColorSpecialNone (GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y); -static BOOL setFinalBGColorSpecialBlend (GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y); -static BOOL setFinalBGColorSpecialIncrease (GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y); -static BOOL setFinalBGColorSpecialDecrease (GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y); +static BOOL setFinalColorSpecialNone (const GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y); +static BOOL setFinalColorSpecialBlend (const GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y); +static BOOL setFinalColorSpecialIncrease (const GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y); +static BOOL setFinalColorSpecialDecrease (const GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y); //static BOOL setFinalColorDirectWnd (const GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y); -static BOOL setFinalBGColorSpecialNoneWnd (GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y); -static BOOL setFinalBGColorSpecialBlendWnd (GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y); -static BOOL setFinalBGColorSpecialIncreaseWnd (GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y); -static BOOL setFinalBGColorSpecialDecreaseWnd (GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y); - -static BOOL setFinal3DColorSpecialNone (GPU *gpu, u32 passing, u8 *dst, u16 color, u8 alpha, u16 x, u16 y); -static BOOL setFinal3DColorSpecialBlend (GPU *gpu, u32 passing, u8 *dst, u16 color, u8 alpha, u16 x, u16 y); -static BOOL setFinal3DColorSpecialIncrease (GPU *gpu, u32 passing, u8 *dst, u16 color, u8 alpha, u16 x, u16 y); -static BOOL setFinal3DColorSpecialDecrease (GPU *gpu, u32 passing, u8 *dst, u16 color, u8 alpha, u16 x, u16 y); -static BOOL setFinal3DColorSpecialNoneWnd (GPU *gpu, u32 passing, u8 *dst, u16 color, u8 alpha, u16 x, u16 y); -static BOOL setFinal3DColorSpecialBlendWnd (GPU *gpu, u32 passing, u8 *dst, u16 color, u8 alpha, u16 x, u16 y); -static BOOL setFinal3DColorSpecialIncreaseWnd (GPU *gpu, u32 passing, u8 *dst, u16 color, u8 alpha, u16 x, u16 y); -static BOOL setFinal3DColorSpecialDecreaseWnd (GPU *gpu, u32 passing, u8 *dst, u16 color, u8 alpha, u16 x, u16 y); +static BOOL setFinalColorSpecialNoneWnd (const GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y); +static BOOL setFinalColorSpecialBlendWnd (const GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y); +static BOOL setFinalColorSpecialIncreaseWnd (const GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y); +static BOOL setFinalColorSpecialDecreaseWnd (const GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y); -typedef BOOL (*FinalBGColFunct)(GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y); -typedef BOOL (*Final3DColFunct)(GPU *gpu, u32 passing, u8 *dst, u16 color, u8 alpha, u16 x, u16 y); +typedef BOOL (*FinalColFunct)(const GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y); -FinalBGColFunct pixelBlittersBG[8] = { //setFinalColorDirect, - setFinalBGColorSpecialNone, - setFinalBGColorSpecialBlend, - setFinalBGColorSpecialIncrease, - setFinalBGColorSpecialDecrease, +FinalColFunct pixelBlitters[8] = { //setFinalColorDirect, + setFinalColorSpecialNone, + setFinalColorSpecialBlend, + setFinalColorSpecialIncrease, + setFinalColorSpecialDecrease, //setFinalColorDirectWnd, - setFinalBGColorSpecialNoneWnd, - setFinalBGColorSpecialBlendWnd, - setFinalBGColorSpecialIncreaseWnd, - setFinalBGColorSpecialDecreaseWnd}; - -Final3DColFunct pixelBlitters3D[8] = { - setFinal3DColorSpecialNone, - setFinal3DColorSpecialBlend, - setFinal3DColorSpecialIncrease, - setFinal3DColorSpecialDecrease, - setFinal3DColorSpecialNoneWnd, - setFinal3DColorSpecialBlendWnd, - setFinal3DColorSpecialIncreaseWnd, - setFinal3DColorSpecialDecreaseWnd}; + setFinalColorSpecialNoneWnd, + setFinalColorSpecialBlendWnd, + setFinalColorSpecialIncreaseWnd, + setFinalColorSpecialDecreaseWnd}; u16 fadeInColors[17][0x8000]; u16 fadeOutColors[17][0x8000]; @@ -223,9 +203,8 @@ GPU * GPU_Init(u8 l) } } - g->setFinalColorBck = setFinalBGColorSpecialNone; - g->setFinalColorSpr = setFinalBGColorSpecialNone; - g->setFinalColor3D = setFinal3DColorSpecialNone; + g->setFinalColorBck = setFinalColorSpecialNone; + g->setFinalColorSpr = setFinalColorSpecialNone; return g; } @@ -234,9 +213,8 @@ void GPU_Reset(GPU *g, u8 l) { memset(g, 0, sizeof(GPU)); - g->setFinalColorBck = setFinalBGColorSpecialNone; - g->setFinalColorSpr = setFinalBGColorSpecialNone; - g->setFinalColor3D = setFinal3DColorSpecialNone; + g->setFinalColorBck = setFinalColorSpecialNone; + g->setFinalColorSpr = setFinalColorSpecialNone; g->core = l; g->BGSize[0][0] = g->BGSize[1][0] = g->BGSize[2][0] = g->BGSize[3][0] = 256; g->BGSize[0][1] = g->BGSize[1][1] = g->BGSize[2][1] = g->BGSize[3][1] = 256; @@ -341,9 +319,8 @@ void SetupFinalPixelBlitter (GPU *gpu) u8 windowUsed = (gpu->WIN0_ENABLED | gpu->WIN1_ENABLED | gpu->WINOBJ_ENABLED); u8 blendMode = (gpu->BLDCNT >> 6)&3; - gpu->setFinalColorSpr = pixelBlittersBG[windowUsed*4 + blendMode]; - gpu->setFinalColorBck = pixelBlittersBG[windowUsed*4 + blendMode]; - gpu->setFinalColor3D = pixelBlitters3D[windowUsed*4 + blendMode]; + gpu->setFinalColorSpr = pixelBlitters[windowUsed*4 + blendMode]; + gpu->setFinalColorBck = pixelBlitters[windowUsed*4 + blendMode]; } /* Sets up LCD control variables for Display Engines A and B for quick reading */ @@ -558,10 +535,10 @@ static INLINE void renderline_checkWindows(const GPU *gpu, u8 bgnum, u16 x, u16 } /*****************************************************************************/ -// PIXEL RENDERING - BGS +// PIXEL RENDERING /*****************************************************************************/ -static BOOL setFinalBGColorSpecialNone (GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y) +static BOOL setFinalColorSpecialNone (const GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y) { //sprwin test hack - use this code //BOOL windowDraw = TRUE, windowEffect = TRUE; @@ -570,11 +547,10 @@ static BOOL setFinalBGColorSpecialNone (GPU *gpu, u32 passing, u8 bgnum, u8 *dst //return 1; T2WriteWord(dst, passing, color); - gpu->bgPixels[x] = bgnum; return 1; } -static BOOL setFinalBGColorSpecialBlend (GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y) +static BOOL setFinalColorSpecialBlend (const GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y) { if ((gpu->BLDCNT >> bgnum)&1 && gpu->BLDALPHA_EVA) { @@ -605,18 +581,16 @@ static BOOL setFinalBGColorSpecialBlend (GPU *gpu, u32 passing, u8 bgnum, u8 *ds color = (sourceR & 0x1F) | ((sourceG & 0x1F) << 5) | ((sourceB & 0x1F) << 10) | 0x8000 ; T2WriteWord(dst, passing, color); - gpu->bgPixels[x] = bgnum; } else { T2WriteWord(dst, passing, color); - gpu->bgPixels[x] = bgnum; } return 1; } -static BOOL setFinalBGColorSpecialIncrease (GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y) +static BOOL setFinalColorSpecialIncrease (const GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y) { if ((gpu->BLDCNT >> bgnum)&1) // the bg to draw has a special color effect { @@ -636,18 +610,16 @@ static BOOL setFinalBGColorSpecialIncrease (GPU *gpu, u32 passing, u8 bgnum, u8 } T2WriteWord(dst, passing, color) ; - gpu->bgPixels[x] = bgnum; } else { T2WriteWord(dst, passing, color); - gpu->bgPixels[x] = bgnum; } return 1; } -static BOOL setFinalBGColorSpecialDecrease (GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y) +static BOOL setFinalColorSpecialDecrease (const GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y) { if ((gpu->BLDCNT >> bgnum)&1) // the bg to draw has a special color effect { @@ -666,18 +638,16 @@ static BOOL setFinalBGColorSpecialDecrease (GPU *gpu, u32 passing, u8 bgnum, u8 color = (fadeOutColors[gpu->BLDY_EVY][color&0x7FFF] | 0x8000); } T2WriteWord(dst, passing, color) ; - gpu->bgPixels[x] = bgnum; } else { T2WriteWord(dst, passing, color); - gpu->bgPixels[x] = bgnum; } return 1; } -static BOOL setFinalBGColorSpecialNoneWnd (GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y) +static BOOL setFinalColorSpecialNoneWnd (const GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y) { BOOL windowDraw = TRUE, windowEffect = TRUE; @@ -686,21 +656,17 @@ static BOOL setFinalBGColorSpecialNoneWnd (GPU *gpu, u32 passing, u8 bgnum, u8 * if (((gpu->BLDCNT >> bgnum)&1) && windowEffect) // the bg to draw has a special color effect { T2WriteWord(dst, passing, color); - gpu->bgPixels[x] = bgnum; } else { if ((windowEffect && (gpu->BLDCNT & (0x100 << bgnum))) || windowDraw) - { T2WriteWord(dst, passing, color); - gpu->bgPixels[x] = bgnum; - } } return windowDraw; } -static BOOL setFinalBGColorSpecialBlendWnd (GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y) +static BOOL setFinalColorSpecialBlendWnd (const GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y) { BOOL windowDraw = TRUE, windowEffect = TRUE; @@ -736,21 +702,17 @@ static BOOL setFinalBGColorSpecialBlendWnd (GPU *gpu, u32 passing, u8 bgnum, u8 color = (sourceR & 0x1F) | ((sourceG & 0x1F) << 5) | ((sourceB & 0x1F) << 10) | 0x8000 ; T2WriteWord(dst, passing, color); - gpu->bgPixels[x] = bgnum; } else { if ((windowEffect && (gpu->BLDCNT & (0x100 << bgnum))) || windowDraw) - { T2WriteWord(dst, passing, color); - gpu->bgPixels[x] = bgnum; - } } return windowDraw; } -static BOOL setFinalBGColorSpecialIncreaseWnd (GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y) +static BOOL setFinalColorSpecialIncreaseWnd (const GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y) { BOOL windowDraw = TRUE, windowEffect = TRUE; @@ -774,21 +736,17 @@ static BOOL setFinalBGColorSpecialIncreaseWnd (GPU *gpu, u32 passing, u8 bgnum, } T2WriteWord(dst, passing, color) ; - gpu->bgPixels[x] = bgnum; } else { if ((windowEffect && (gpu->BLDCNT & (0x100 << bgnum))) || windowDraw) - { T2WriteWord(dst, passing, color); - gpu->bgPixels[x] = bgnum; - } } return windowDraw; } -static BOOL setFinalBGColorSpecialDecreaseWnd (GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y) +static BOOL setFinalColorSpecialDecreaseWnd (const GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y) { BOOL windowDraw = TRUE, windowEffect = TRUE; @@ -811,241 +769,11 @@ static BOOL setFinalBGColorSpecialDecreaseWnd (GPU *gpu, u32 passing, u8 bgnum, color = (fadeOutColors[gpu->BLDY_EVY][color&0x7FFF] | 0x8000); } T2WriteWord(dst, passing, color) ; - gpu->bgPixels[x] = bgnum; } else { if ((windowEffect && (gpu->BLDCNT & (0x100 << bgnum))) || windowDraw) - { T2WriteWord(dst, passing, color); - gpu->bgPixels[x] = bgnum; - } - } - - return windowDraw; -} - -/*****************************************************************************/ -// PIXEL RENDERING - 3D -/*****************************************************************************/ - -static BOOL setFinal3DColorSpecialNone(GPU *gpu, u32 passing, u8 *dst, u16 color, u8 alpha, u16 x, u16 y) -{ - T2WriteWord(dst, passing, (color | 0x8000)); - return 1; -} - -static BOOL setFinal3DColorSpecialBlend(GPU *gpu, u32 passing, u8 *dst, u16 color, u8 alpha, u16 x, u16 y) -{ - /* We can blend if the 3D layer is selected as 1st target, */ - /* but also if the 3D layer has the highest prio. */ - if((gpu->BLDCNT & 0x1) || (gpu->dispx_st->dispx_BGxCNT[0].bits.Priority == 0)) - { - int bg_under = gpu->bgPixels[x]; - u16 final = color; - - /* If the layer we are drawing on is selected as 2nd source, we can blend */ - if(gpu->BLDCNT & (1 << (8 + bg_under))) - { - /* Test for easy cases like alpha = min or max */ - if(alpha == 16) - { - final = color; - } - else if(alpha == 0) - { - final = T2ReadWord(dst, passing); - } - else - { - COLOR c1, c2, cfinal; - - c1.val = color; - c2.val = T2ReadWord(dst, passing); - - cfinal.bits.red = ((c1.bits.red * alpha / 16) + (c2.bits.red * (16 - alpha) / 16)); - cfinal.bits.green = ((c1.bits.green * alpha / 16) + (c2.bits.green * (16 - alpha) / 16)); - cfinal.bits.blue = ((c1.bits.blue * alpha / 16) + (c2.bits.blue * (16 - alpha) / 16)); - - final = cfinal.val; - } - } - - T2WriteWord(dst, passing, (final | 0x8000)); - gpu->bgPixels[x] = 0; - } - else - { - T2WriteWord(dst, passing, (color | 0x8000)); - gpu->bgPixels[x] = 0; - } - - return 1; -} - -static BOOL setFinal3DColorSpecialIncrease(GPU *gpu, u32 passing, u8 *dst, u16 color, u8 alpha, u16 x, u16 y) -{ - if(gpu->BLDCNT & 0x1) - { - if (gpu->BLDY_EVY != 0x0) - { - color = fadeInColors[gpu->BLDY_EVY][color&0x7FFF]; - } - - T2WriteWord(dst, passing, (color | 0x8000)); - gpu->bgPixels[x] = 0; - } - else - { - T2WriteWord(dst, passing, (color | 0x8000)); - gpu->bgPixels[x] = 0; - } - - return 1; -} - -static BOOL setFinal3DColorSpecialDecrease(GPU *gpu, u32 passing, u8 *dst, u16 color, u8 alpha, u16 x, u16 y) -{ - if(gpu->BLDCNT & 0x1) - { - if (gpu->BLDY_EVY != 0x0) - { - color = fadeOutColors[gpu->BLDY_EVY][color&0x7FFF]; - } - - T2WriteWord(dst, passing, (color | 0x8000)); - gpu->bgPixels[x] = 0; - } - else - { - T2WriteWord(dst, passing, (color | 0x8000)); - gpu->bgPixels[x] = 0; - } - - return 1; -} - -static BOOL setFinal3DColorSpecialNoneWnd(GPU *gpu, u32 passing, u8 *dst, u16 color, u8 alpha, u16 x, u16 y) -{ - BOOL windowDraw = TRUE, windowEffect = TRUE; - - renderline_checkWindows(gpu, 0, x, y, &windowDraw, &windowEffect); - - if(windowDraw) - { - T2WriteWord(dst, passing, (color | 0x8000)); - gpu->bgPixels[x] = 0; - } - - return windowDraw; -} - -static BOOL setFinal3DColorSpecialBlendWnd(GPU *gpu, u32 passing, u8 *dst, u16 color, u8 alpha, u16 x, u16 y) -{ - BOOL windowDraw = TRUE, windowEffect = TRUE; - - renderline_checkWindows(gpu, 0, x, y, &windowDraw, &windowEffect); - - if(windowDraw) - { - /* We can blend if the 3D layer is selected as 1st target, */ - /* but also if the 3D layer has the highest prio. */ - if(((gpu->BLDCNT & 0x1) && windowEffect) || (gpu->dispx_st->dispx_BGxCNT[0].bits.Priority == 0)) - { - int bg_under = gpu->bgPixels[x]; - u16 final = color; - - /* If the layer we are drawing on is selected as 2nd source, we can blend */ - if(gpu->BLDCNT & (1 << (8 + bg_under))) - { - /* Test for easy cases like alpha = min or max */ - if(alpha == 16) - { - final = color; - } - else if(alpha == 0) - { - final = T2ReadWord(dst, passing); - } - else - { - COLOR c1, c2, cfinal; - - c1.val = color; - c2.val = T2ReadWord(dst, passing); - - cfinal.bits.red = ((c1.bits.red * alpha / 16) + (c2.bits.red * (16 - alpha) / 16)); - cfinal.bits.green = ((c1.bits.green * alpha / 16) + (c2.bits.green * (16 - alpha) / 16)); - cfinal.bits.blue = ((c1.bits.blue * alpha / 16) + (c2.bits.blue * (16 - alpha) / 16)); - - final = cfinal.val; - } - } - - T2WriteWord(dst, passing, (final | 0x8000)); - gpu->bgPixels[x] = 0; - } - else - { - T2WriteWord(dst, passing, (color | 0x8000)); - gpu->bgPixels[x] = 0; - } - } - - return windowDraw; -} - -static BOOL setFinal3DColorSpecialIncreaseWnd(GPU *gpu, u32 passing, u8 *dst, u16 color, u8 alpha, u16 x, u16 y) -{ - BOOL windowDraw = TRUE, windowEffect = TRUE; - - renderline_checkWindows(gpu, 0, x, y, &windowDraw, &windowEffect); - - if(windowDraw) - { - if((gpu->BLDCNT & 0x1) && windowEffect) - { - if (gpu->BLDY_EVY != 0x0) - { - color = fadeInColors[gpu->BLDY_EVY][color&0x7FFF]; - } - - T2WriteWord(dst, passing, (color | 0x8000)); - gpu->bgPixels[x] = 0; - } - else - { - T2WriteWord(dst, passing, (color | 0x8000)); - gpu->bgPixels[x] = 0; - } - } - - return windowDraw; -} - -static BOOL setFinal3DColorSpecialDecreaseWnd(GPU *gpu, u32 passing, u8 *dst, u16 color, u8 alpha, u16 x, u16 y) -{ - BOOL windowDraw = TRUE, windowEffect = TRUE; - - renderline_checkWindows(gpu, 0, x, y, &windowDraw, &windowEffect); - - if(windowDraw) - { - if((gpu->BLDCNT & 0x1) && windowEffect) - { - if (gpu->BLDY_EVY != 0x0) - { - color = fadeOutColors[gpu->BLDY_EVY][color&0x7FFF]; - } - - T2WriteWord(dst, passing, (color | 0x8000)); - gpu->bgPixels[x] = 0; - } - else - { - T2WriteWord(dst, passing, (color | 0x8000)); - gpu->bgPixels[x] = 0; - } } return windowDraw; @@ -1055,7 +783,7 @@ static BOOL setFinal3DColorSpecialDecreaseWnd(GPU *gpu, u32 passing, u8 *dst, u1 // BACKGROUND RENDERING -TEXT- /*****************************************************************************/ // render a text background to the combined pixelbuffer -INLINE void renderline_textBG(GPU * gpu, u8 num, u8 * dst, u32 Y, u16 XBG, u16 YBG, u16 LG) +INLINE void renderline_textBG(const GPU * gpu, u8 num, u8 * dst, u32 Y, u16 XBG, u16 YBG, u16 LG) { struct _BGxCNT * bgCnt = &(gpu->dispx_st)->dispx_BGxCNT[num].bits; struct _DISPCNT * dispCnt = &(gpu->dispx_st)->dispx_DISPCNT.bits; @@ -1460,7 +1188,7 @@ void lineExtRot(GPU * gpu, u8 num, u16 l, u8 * DST) 256); } -void textBG(GPU * gpu, u8 num, u8 * DST) +void textBG(const GPU * gpu, u8 num, u8 * DST) { u32 i; for(i = 0; i < gpu->BGSize[num][1]; ++i) @@ -2464,9 +2192,6 @@ static INLINE void GPU_ligne_layer(NDS_Screen * screen, u16 l) for(int i = 0; i< 256; ++i) T2WriteWord(dst, i << 1, c); - /* reset them to backdrop */ - memset(gpu->bgPixels, 5, 256); - if (!gpu->LayersEnable[0] && !gpu->LayersEnable[1] && !gpu->LayersEnable[2] && !gpu->LayersEnable[3] && !gpu->LayersEnable[4]) return; @@ -2520,9 +2245,6 @@ static INLINE void GPU_ligne_layer(NDS_Screen * screen, u16 l) { if (i16 == 0 && dispCnt->BG0_3D) { - u16 line3Dcolor[256]; - u8 line3Dalpha[256]; - //determine the 3d range to grab BGxOFS * bgofs = &gpu->dispx_st->dispx_BGxOFS[i16]; s16 hofs = (s16)T1ReadWord((u8 *)&bgofs->BGxHOFS, 0); @@ -2531,13 +2253,7 @@ static INLINE void GPU_ligne_layer(NDS_Screen * screen, u16 l) else if(hofs<0) { start = -hofs; end=255; ofs=0; } else { start = 0; end=255-hofs; ofs=hofs; } - //gpu3D->NDS_3D_GetLine (l, start, end, (u16*)dst+ofs); - gpu3D->NDS_3D_GetLine(l, start, end, line3Dcolor + ofs, line3Dalpha + ofs); - - for(int k = start; k <= end; k++) - if(line3Dcolor[k] & 0x8000) - gpu->setFinalColor3D(gpu, (k << 1), dst, line3Dcolor[k], line3Dalpha[k], k, l); - + gpu3D->NDS_3D_GetLine (l, start, end, (u16*)dst+ofs); continue; } } diff --git a/desmume/src/GPU.h b/src/GPU.h similarity index 95% rename from desmume/src/GPU.h rename to src/GPU.h index dac7c2aa2..c6f25050b 100644 --- a/desmume/src/GPU.h +++ b/src/GPU.h @@ -661,11 +661,8 @@ struct _GPU u8 MasterBrightMode; u32 MasterBrightFactor; - u8 bgPixels[256]; - - BOOL (*setFinalColorSpr)(GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y); - BOOL (*setFinalColorBck)(GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y); - BOOL (*setFinalColor3D) (GPU *gpu, u32 passing, u8 *dst, u16 color, u8 alpha, u16 x, u16 y); + BOOL (*setFinalColorSpr)(const GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y); + BOOL (*setFinalColorBck)(const GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y); void (*spriteRender) (GPU * gpu, u16 l, u8 * dst, u8 * prioTab); }; /* @@ -695,7 +692,7 @@ GPU * GPU_Init(u8 l); void GPU_Reset(GPU *g, u8 l); void GPU_DeInit(GPU *); -void textBG(GPU * gpu, u8 num, u8 * DST); //Draw text based background +void textBG(const GPU * gpu, u8 num, u8 * DST); //Draw text based background void rotBG(GPU * gpu, u8 num, u8 * DST); void extRotBG(GPU * gpu, u8 num, u8 * DST); void sprite1D(GPU * gpu, u16 l, u8 * dst, u8 * prioTab); diff --git a/desmume/src/GPU_osd.cpp b/src/GPU_osd.cpp similarity index 100% rename from desmume/src/GPU_osd.cpp rename to src/GPU_osd.cpp diff --git a/desmume/src/GPU_osd.h b/src/GPU_osd.h similarity index 100% rename from desmume/src/GPU_osd.h rename to src/GPU_osd.h diff --git a/desmume/src/MMU.cpp b/src/MMU.cpp similarity index 100% rename from desmume/src/MMU.cpp rename to src/MMU.cpp diff --git a/desmume/src/MMU.h b/src/MMU.h similarity index 100% rename from desmume/src/MMU.h rename to src/MMU.h diff --git a/desmume/src/Makefile.am b/src/Makefile.am similarity index 100% rename from desmume/src/Makefile.am rename to src/Makefile.am diff --git a/desmume/src/NDSSystem.cpp b/src/NDSSystem.cpp similarity index 100% rename from desmume/src/NDSSystem.cpp rename to src/NDSSystem.cpp diff --git a/desmume/src/NDSSystem.h b/src/NDSSystem.h similarity index 100% rename from desmume/src/NDSSystem.h rename to src/NDSSystem.h diff --git a/desmume/src/OGLRender.cpp b/src/OGLRender.cpp similarity index 93% rename from desmume/src/OGLRender.cpp rename to src/OGLRender.cpp index ba2c1ab9a..8f564a305 100644 --- a/desmume/src/OGLRender.cpp +++ b/src/OGLRender.cpp @@ -74,7 +74,7 @@ static void ENDGL() { #endif static ALIGN(16) unsigned char GPU_screen3D [256*256*4]; -//static ALIGN(16) unsigned char GPU_screenStencil[256*256]; +static ALIGN(16) unsigned char GPU_screenStencil[256*256]; static const unsigned short map3d_cull[4] = {GL_FRONT_AND_BACK, GL_FRONT, GL_BACK, 0}; static const int texEnv[4] = { GL_MODULATE, GL_DECAL, GL_MODULATE, GL_MODULATE }; @@ -367,7 +367,7 @@ static void OGLReset() texcache_stop=MAX_TEXTURE<<1; //clear the framebuffers -// memset(GPU_screenStencil,0,sizeof(GPU_screenStencil)); + memset(GPU_screenStencil,0,sizeof(GPU_screenStencil)); memset(GPU_screen3D,0,sizeof(GPU_screen3D)); } @@ -1037,7 +1037,7 @@ static void OGLRender() //printf("%d\n",gfx3d.projlist->count); //we're not using the alpha clear color right now - glClearColor(gfx3d.clearColor[0],gfx3d.clearColor[1],gfx3d.clearColor[2], gfx3d.clearColor[3]); + glClearColor(gfx3d.clearColor[0],gfx3d.clearColor[1],gfx3d.clearColor[2], clearAlpha); glClearDepth(gfx3d.clearDepth); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); @@ -1118,7 +1118,7 @@ static void GL_ReadFramebuffer() { if(!BEGINGL()) return; glFinish(); -// glReadPixels(0,0,256,192,GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, GPU_screenStencil); + glReadPixels(0,0,256,192,GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, GPU_screenStencil); glReadPixels(0,0,256,192,GL_BGRA_EXT, GL_UNSIGNED_BYTE, GPU_screen3D); ENDGL(); @@ -1160,31 +1160,30 @@ static void OGLGetLineCaptured(int line, u16* dst) } u8 *screen3D = (u8*)GPU_screen3D+((191-line)<<10); -// u8 *screenStencil = (u8*)GPU_screenStencil+((191-line)<<8); + u8 *screenStencil = (u8*)GPU_screenStencil+((191-line)<<8); for(int i = 0; i < 256; i++) { - /* u32 stencil = screenStencil[i]; + u32 stencil = screenStencil[i]; if(!stencil) { dst[i] = 0x0000; continue; - }*/ + } int t=i<<2; - /* u8 r = screen3D[t+2]; - u8 g = screen3D[t+1]; - u8 b = screen3D[t+0];*/ + u32 r = screen3D[t+2]; + u32 g = screen3D[t+1]; + u32 b = screen3D[t+0]; //if this math strikes you as wrong, be sure to look at GL_ReadFramebuffer() where the pixel format in screen3D is changed - //dst[i] = (b<<10) | (g<<5) | (r) | 0x8000; - dst[i] = (screen3D[t+2] | (screen3D[t+1] << 5) | (screen3D[t+0] << 10) | ((screen3D[t+3] > 0) ? 0x8000 : 0x0000)); + dst[i] = (b<<10) | (g<<5) | (r) | 0x8000; } } -static void OGLGetLine(int line, int start, int end_inclusive, u16* dst, u8* dstAlpha) +static void OGLGetLine(int line, int start, int end_inclusive, u16* dst) { assert(line<192 && line>=0); @@ -1194,7 +1193,7 @@ static void OGLGetLine(int line, int start, int end_inclusive, u16* dst, u8* dst } u8 *screen3D = (u8*)GPU_screen3D+((191-line)<<10); - //u8 *screenStencil = (u8*)GPU_screenStencil+((191-line)<<8); + u8 *screenStencil = (u8*)GPU_screenStencil+((191-line)<<8); //the renderer clears the stencil to 0 //then it sets it to 1 whenever it renders a pixel that passes the alpha test @@ -1208,18 +1207,15 @@ static void OGLGetLine(int line, int start, int end_inclusive, u16* dst, u8* dst for(int i = start, j=0; i <= end_inclusive; ++i, ++j) { - // u32 stencil = screenStencil[i]; + u32 stencil = screenStencil[i]; //you would use this if you wanted to use the stencil buffer to make decisions here - // if(!stencil) continue; + if(!stencil) continue; - // u16 oldcolor = dst[j]; + u16 oldcolor = dst[j]; int t=i<<2; - // u32 dstpixel; - - dst[j] = (screen3D[t+2] | (screen3D[t+1] << 5) | (screen3D[t+0] << 10) | ((screen3D[t+3] > 0) ? 0x8000 : 0x0000)); - dstAlpha[j] = (screen3D[t+3] / 2); + u32 dstpixel; //old debug reminder: display alpha channel //u32 r = screen3D[t+3]; @@ -1228,7 +1224,7 @@ static void OGLGetLine(int line, int start, int end_inclusive, u16* dst, u8* dst //if this math strikes you as wrong, be sure to look at GL_ReadFramebuffer() where the pixel format in screen3D is changed - /* u32 a = screen3D[t+3]; + u32 a = screen3D[t+3]; typedef u8 mixtbl[32][32]; mixtbl & mix = mixTable555[a]; @@ -1251,7 +1247,7 @@ static void OGLGetLine(int line, int start, int end_inclusive, u16* dst, u8* dst newpix = mix[newpix][oldpix]; dstpixel |= (newpix<<10); - dst[j] = dstpixel;*/ + dst[j] = dstpixel; } } diff --git a/desmume/src/OGLRender.h b/src/OGLRender.h similarity index 100% rename from desmume/src/OGLRender.h rename to src/OGLRender.h diff --git a/desmume/src/PACKED.h b/src/PACKED.h similarity index 100% rename from desmume/src/PACKED.h rename to src/PACKED.h diff --git a/desmume/src/PACKED_END.h b/src/PACKED_END.h similarity index 100% rename from desmume/src/PACKED_END.h rename to src/PACKED_END.h diff --git a/desmume/src/ROMReader.cpp b/src/ROMReader.cpp similarity index 100% rename from desmume/src/ROMReader.cpp rename to src/ROMReader.cpp diff --git a/desmume/src/ROMReader.h b/src/ROMReader.h similarity index 100% rename from desmume/src/ROMReader.h rename to src/ROMReader.h diff --git a/desmume/src/SPU.cpp b/src/SPU.cpp similarity index 100% rename from desmume/src/SPU.cpp rename to src/SPU.cpp diff --git a/desmume/src/SPU.h b/src/SPU.h similarity index 100% rename from desmume/src/SPU.h rename to src/SPU.h diff --git a/desmume/src/arm_instructions.cpp b/src/arm_instructions.cpp similarity index 100% rename from desmume/src/arm_instructions.cpp rename to src/arm_instructions.cpp diff --git a/desmume/src/arm_instructions.h b/src/arm_instructions.h similarity index 100% rename from desmume/src/arm_instructions.h rename to src/arm_instructions.h diff --git a/desmume/src/armcpu.cpp b/src/armcpu.cpp similarity index 100% rename from desmume/src/armcpu.cpp rename to src/armcpu.cpp diff --git a/desmume/src/armcpu.h b/src/armcpu.h similarity index 100% rename from desmume/src/armcpu.h rename to src/armcpu.h diff --git a/desmume/src/bios.cpp b/src/bios.cpp similarity index 100% rename from desmume/src/bios.cpp rename to src/bios.cpp diff --git a/desmume/src/bios.h b/src/bios.h similarity index 100% rename from desmume/src/bios.h rename to src/bios.h diff --git a/desmume/src/bits.h b/src/bits.h similarity index 100% rename from desmume/src/bits.h rename to src/bits.h diff --git a/desmume/src/build.bat b/src/build.bat similarity index 100% rename from desmume/src/build.bat rename to src/build.bat diff --git a/desmume/src/cflash.cpp b/src/cflash.cpp similarity index 100% rename from desmume/src/cflash.cpp rename to src/cflash.cpp diff --git a/desmume/src/cflash.h b/src/cflash.h similarity index 100% rename from desmume/src/cflash.h rename to src/cflash.h diff --git a/desmume/src/cli/Makefile.am b/src/cli/Makefile.am similarity index 100% rename from desmume/src/cli/Makefile.am rename to src/cli/Makefile.am diff --git a/desmume/src/cli/doc/Makefile.am b/src/cli/doc/Makefile.am similarity index 100% rename from desmume/src/cli/doc/Makefile.am rename to src/cli/doc/Makefile.am diff --git a/desmume/src/cli/doc/desmume-cli.1 b/src/cli/doc/desmume-cli.1 similarity index 100% rename from desmume/src/cli/doc/desmume-cli.1 rename to src/cli/doc/desmume-cli.1 diff --git a/desmume/src/cli/main.cpp b/src/cli/main.cpp similarity index 100% rename from desmume/src/cli/main.cpp rename to src/cli/main.cpp diff --git a/desmume/src/cocoa/DeSmuME.cbp b/src/cocoa/DeSmuME.cbp similarity index 100% rename from desmume/src/cocoa/DeSmuME.cbp rename to src/cocoa/DeSmuME.cbp diff --git a/desmume/src/cocoa/DeSmuME.icns b/src/cocoa/DeSmuME.icns similarity index 100% rename from desmume/src/cocoa/DeSmuME.icns rename to src/cocoa/DeSmuME.icns diff --git a/desmume/src/cocoa/DeSmuME.xcodeproj/project.pbxproj b/src/cocoa/DeSmuME.xcodeproj/project.pbxproj similarity index 100% rename from desmume/src/cocoa/DeSmuME.xcodeproj/project.pbxproj rename to src/cocoa/DeSmuME.xcodeproj/project.pbxproj diff --git a/desmume/src/cocoa/English.nib/classes.nib b/src/cocoa/English.nib/classes.nib similarity index 100% rename from desmume/src/cocoa/English.nib/classes.nib rename to src/cocoa/English.nib/classes.nib diff --git a/desmume/src/cocoa/English.nib/info.nib b/src/cocoa/English.nib/info.nib similarity index 100% rename from desmume/src/cocoa/English.nib/info.nib rename to src/cocoa/English.nib/info.nib diff --git a/desmume/src/cocoa/English.nib/keyedobjects.nib b/src/cocoa/English.nib/keyedobjects.nib similarity index 100% rename from desmume/src/cocoa/English.nib/keyedobjects.nib rename to src/cocoa/English.nib/keyedobjects.nib diff --git a/desmume/src/cocoa/English.strings b/src/cocoa/English.strings similarity index 100% rename from desmume/src/cocoa/English.strings rename to src/cocoa/English.strings diff --git a/desmume/src/cocoa/French.nib/classes.nib b/src/cocoa/French.nib/classes.nib similarity index 100% rename from desmume/src/cocoa/French.nib/classes.nib rename to src/cocoa/French.nib/classes.nib diff --git a/desmume/src/cocoa/French.nib/info.nib b/src/cocoa/French.nib/info.nib similarity index 100% rename from desmume/src/cocoa/French.nib/info.nib rename to src/cocoa/French.nib/info.nib diff --git a/desmume/src/cocoa/French.nib/keyedobjects.nib b/src/cocoa/French.nib/keyedobjects.nib similarity index 100% rename from desmume/src/cocoa/French.nib/keyedobjects.nib rename to src/cocoa/French.nib/keyedobjects.nib diff --git a/desmume/src/cocoa/French.strings b/src/cocoa/French.strings similarity index 100% rename from desmume/src/cocoa/French.strings rename to src/cocoa/French.strings diff --git a/desmume/src/cocoa/Info.plist b/src/cocoa/Info.plist similarity index 100% rename from desmume/src/cocoa/Info.plist rename to src/cocoa/Info.plist diff --git a/desmume/src/cocoa/InfoPlist.strings b/src/cocoa/InfoPlist.strings similarity index 100% rename from desmume/src/cocoa/InfoPlist.strings rename to src/cocoa/InfoPlist.strings diff --git a/desmume/src/cocoa/Japanese.nib/classes.nib b/src/cocoa/Japanese.nib/classes.nib similarity index 100% rename from desmume/src/cocoa/Japanese.nib/classes.nib rename to src/cocoa/Japanese.nib/classes.nib diff --git a/desmume/src/cocoa/Japanese.nib/info.nib b/src/cocoa/Japanese.nib/info.nib similarity index 100% rename from desmume/src/cocoa/Japanese.nib/info.nib rename to src/cocoa/Japanese.nib/info.nib diff --git a/desmume/src/cocoa/Japanese.nib/keyedobjects.nib b/src/cocoa/Japanese.nib/keyedobjects.nib similarity index 100% rename from desmume/src/cocoa/Japanese.nib/keyedobjects.nib rename to src/cocoa/Japanese.nib/keyedobjects.nib diff --git a/desmume/src/cocoa/Japanese.strings b/src/cocoa/Japanese.strings similarity index 100% rename from desmume/src/cocoa/Japanese.strings rename to src/cocoa/Japanese.strings diff --git a/desmume/src/cocoa/Makefile.am b/src/cocoa/Makefile.am similarity index 100% rename from desmume/src/cocoa/Makefile.am rename to src/cocoa/Makefile.am diff --git a/desmume/src/cocoa/PkgInfo b/src/cocoa/PkgInfo similarity index 100% rename from desmume/src/cocoa/PkgInfo rename to src/cocoa/PkgInfo diff --git a/desmume/src/cocoa/Rakefile b/src/cocoa/Rakefile similarity index 100% rename from desmume/src/cocoa/Rakefile rename to src/cocoa/Rakefile diff --git a/desmume/src/cocoa/about.m b/src/cocoa/about.m similarity index 100% rename from desmume/src/cocoa/about.m rename to src/cocoa/about.m diff --git a/desmume/src/cocoa/cocoa_util.m b/src/cocoa/cocoa_util.m similarity index 100% rename from desmume/src/cocoa/cocoa_util.m rename to src/cocoa/cocoa_util.m diff --git a/desmume/src/cocoa/dialogs/rom_info.h b/src/cocoa/dialogs/rom_info.h similarity index 100% rename from desmume/src/cocoa/dialogs/rom_info.h rename to src/cocoa/dialogs/rom_info.h diff --git a/desmume/src/cocoa/dialogs/rom_info.m b/src/cocoa/dialogs/rom_info.m similarity index 100% rename from desmume/src/cocoa/dialogs/rom_info.m rename to src/cocoa/dialogs/rom_info.m diff --git a/desmume/src/cocoa/dialogs/speed_limit_selection_window.h b/src/cocoa/dialogs/speed_limit_selection_window.h similarity index 100% rename from desmume/src/cocoa/dialogs/speed_limit_selection_window.h rename to src/cocoa/dialogs/speed_limit_selection_window.h diff --git a/desmume/src/cocoa/dialogs/speed_limit_selection_window.m b/src/cocoa/dialogs/speed_limit_selection_window.m similarity index 100% rename from desmume/src/cocoa/dialogs/speed_limit_selection_window.m rename to src/cocoa/dialogs/speed_limit_selection_window.m diff --git a/desmume/src/cocoa/globals.h b/src/cocoa/globals.h similarity index 100% rename from desmume/src/cocoa/globals.h rename to src/cocoa/globals.h diff --git a/desmume/src/cocoa/input.h b/src/cocoa/input.h similarity index 100% rename from desmume/src/cocoa/input.h rename to src/cocoa/input.h diff --git a/desmume/src/cocoa/input.m b/src/cocoa/input.m similarity index 100% rename from desmume/src/cocoa/input.m rename to src/cocoa/input.m diff --git a/desmume/src/cocoa/main.m b/src/cocoa/main.m similarity index 100% rename from desmume/src/cocoa/main.m rename to src/cocoa/main.m diff --git a/desmume/src/cocoa/main_window.h b/src/cocoa/main_window.h similarity index 100% rename from desmume/src/cocoa/main_window.h rename to src/cocoa/main_window.h diff --git a/desmume/src/cocoa/main_window.m b/src/cocoa/main_window.m similarity index 100% rename from desmume/src/cocoa/main_window.m rename to src/cocoa/main_window.m diff --git a/desmume/src/cocoa/makeapp.sh b/src/cocoa/makeapp.sh similarity index 100% rename from desmume/src/cocoa/makeapp.sh rename to src/cocoa/makeapp.sh diff --git a/desmume/src/cocoa/nds_control.h b/src/cocoa/nds_control.h similarity index 100% rename from desmume/src/cocoa/nds_control.h rename to src/cocoa/nds_control.h diff --git a/desmume/src/cocoa/nds_control.mm b/src/cocoa/nds_control.mm similarity index 100% rename from desmume/src/cocoa/nds_control.mm rename to src/cocoa/nds_control.mm diff --git a/desmume/src/cocoa/preferences.h b/src/cocoa/preferences.h similarity index 100% rename from desmume/src/cocoa/preferences.h rename to src/cocoa/preferences.h diff --git a/desmume/src/cocoa/preferences.m b/src/cocoa/preferences.m similarity index 100% rename from desmume/src/cocoa/preferences.m rename to src/cocoa/preferences.m diff --git a/desmume/src/cocoa/screen_state.h b/src/cocoa/screen_state.h similarity index 100% rename from desmume/src/cocoa/screen_state.h rename to src/cocoa/screen_state.h diff --git a/desmume/src/cocoa/screen_state.m b/src/cocoa/screen_state.m similarity index 100% rename from desmume/src/cocoa/screen_state.m rename to src/cocoa/screen_state.m diff --git a/desmume/src/cocoa/screenshot.h b/src/cocoa/screenshot.h similarity index 100% rename from desmume/src/cocoa/screenshot.h rename to src/cocoa/screenshot.h diff --git a/desmume/src/cocoa/screenshot.m b/src/cocoa/screenshot.m similarity index 100% rename from desmume/src/cocoa/screenshot.m rename to src/cocoa/screenshot.m diff --git a/desmume/src/cocoa/sndOSX.h b/src/cocoa/sndOSX.h similarity index 100% rename from desmume/src/cocoa/sndOSX.h rename to src/cocoa/sndOSX.h diff --git a/desmume/src/cocoa/sndOSX.mm b/src/cocoa/sndOSX.mm similarity index 100% rename from desmume/src/cocoa/sndOSX.mm rename to src/cocoa/sndOSX.mm diff --git a/desmume/src/cocoa/video_output_view.h b/src/cocoa/video_output_view.h similarity index 100% rename from desmume/src/cocoa/video_output_view.h rename to src/cocoa/video_output_view.h diff --git a/desmume/src/cocoa/video_output_view.m b/src/cocoa/video_output_view.m similarity index 100% rename from desmume/src/cocoa/video_output_view.m rename to src/cocoa/video_output_view.m diff --git a/desmume/src/common.cpp b/src/common.cpp similarity index 100% rename from desmume/src/common.cpp rename to src/common.cpp diff --git a/desmume/src/common.h b/src/common.h similarity index 100% rename from desmume/src/common.h rename to src/common.h diff --git a/desmume/src/cp15.cpp b/src/cp15.cpp similarity index 100% rename from desmume/src/cp15.cpp rename to src/cp15.cpp diff --git a/desmume/src/cp15.h b/src/cp15.h similarity index 100% rename from desmume/src/cp15.h rename to src/cp15.h diff --git a/desmume/src/ctrlssdl.cpp b/src/ctrlssdl.cpp similarity index 100% rename from desmume/src/ctrlssdl.cpp rename to src/ctrlssdl.cpp diff --git a/desmume/src/ctrlssdl.h b/src/ctrlssdl.h similarity index 100% rename from desmume/src/ctrlssdl.h rename to src/ctrlssdl.h diff --git a/desmume/src/debug.cpp b/src/debug.cpp similarity index 100% rename from desmume/src/debug.cpp rename to src/debug.cpp diff --git a/desmume/src/debug.h b/src/debug.h similarity index 100% rename from desmume/src/debug.h rename to src/debug.h diff --git a/desmume/src/desmume.mk b/src/desmume.mk similarity index 100% rename from desmume/src/desmume.mk rename to src/desmume.mk diff --git a/desmume/src/dscard.h b/src/dscard.h similarity index 100% rename from desmume/src/dscard.h rename to src/dscard.h diff --git a/desmume/src/fat.h b/src/fat.h similarity index 100% rename from desmume/src/fat.h rename to src/fat.h diff --git a/desmume/src/fs-linux.cpp b/src/fs-linux.cpp similarity index 100% rename from desmume/src/fs-linux.cpp rename to src/fs-linux.cpp diff --git a/desmume/src/fs-windows.cpp b/src/fs-windows.cpp similarity index 100% rename from desmume/src/fs-windows.cpp rename to src/fs-windows.cpp diff --git a/desmume/src/fs.h b/src/fs.h similarity index 100% rename from desmume/src/fs.h rename to src/fs.h diff --git a/desmume/src/gdbstub.h b/src/gdbstub.h similarity index 100% rename from desmume/src/gdbstub.h rename to src/gdbstub.h diff --git a/desmume/src/gdbstub/Makefile.am b/src/gdbstub/Makefile.am similarity index 100% rename from desmume/src/gdbstub/Makefile.am rename to src/gdbstub/Makefile.am diff --git a/desmume/src/gdbstub/gdbstub.cpp b/src/gdbstub/gdbstub.cpp similarity index 100% rename from desmume/src/gdbstub/gdbstub.cpp rename to src/gdbstub/gdbstub.cpp diff --git a/desmume/src/gdbstub/gdbstub_internal.h b/src/gdbstub/gdbstub_internal.h similarity index 100% rename from desmume/src/gdbstub/gdbstub_internal.h rename to src/gdbstub/gdbstub_internal.h diff --git a/desmume/src/gfx3d.cpp b/src/gfx3d.cpp similarity index 100% rename from desmume/src/gfx3d.cpp rename to src/gfx3d.cpp diff --git a/desmume/src/gfx3d.h b/src/gfx3d.h similarity index 100% rename from desmume/src/gfx3d.h rename to src/gfx3d.h diff --git a/desmume/src/gtk-glade/Makefile.am b/src/gtk-glade/Makefile.am similarity index 100% rename from desmume/src/gtk-glade/Makefile.am rename to src/gtk-glade/Makefile.am diff --git a/desmume/src/gtk-glade/callbacks.cpp b/src/gtk-glade/callbacks.cpp similarity index 100% rename from desmume/src/gtk-glade/callbacks.cpp rename to src/gtk-glade/callbacks.cpp diff --git a/desmume/src/gtk-glade/callbacks.h b/src/gtk-glade/callbacks.h similarity index 100% rename from desmume/src/gtk-glade/callbacks.h rename to src/gtk-glade/callbacks.h diff --git a/desmume/src/gtk-glade/callbacks_IO.cpp b/src/gtk-glade/callbacks_IO.cpp similarity index 100% rename from desmume/src/gtk-glade/callbacks_IO.cpp rename to src/gtk-glade/callbacks_IO.cpp diff --git a/desmume/src/gtk-glade/callbacks_IO.h b/src/gtk-glade/callbacks_IO.h similarity index 100% rename from desmume/src/gtk-glade/callbacks_IO.h rename to src/gtk-glade/callbacks_IO.h diff --git a/desmume/src/gtk-glade/dTools/callbacks_1_ioregs.cpp b/src/gtk-glade/dTools/callbacks_1_ioregs.cpp similarity index 100% rename from desmume/src/gtk-glade/dTools/callbacks_1_ioregs.cpp rename to src/gtk-glade/dTools/callbacks_1_ioregs.cpp diff --git a/desmume/src/gtk-glade/dTools/callbacks_2_memview.cpp b/src/gtk-glade/dTools/callbacks_2_memview.cpp similarity index 100% rename from desmume/src/gtk-glade/dTools/callbacks_2_memview.cpp rename to src/gtk-glade/dTools/callbacks_2_memview.cpp diff --git a/desmume/src/gtk-glade/dTools/callbacks_3_palview.cpp b/src/gtk-glade/dTools/callbacks_3_palview.cpp similarity index 100% rename from desmume/src/gtk-glade/dTools/callbacks_3_palview.cpp rename to src/gtk-glade/dTools/callbacks_3_palview.cpp diff --git a/desmume/src/gtk-glade/dTools/callbacks_4_tileview.cpp b/src/gtk-glade/dTools/callbacks_4_tileview.cpp similarity index 100% rename from desmume/src/gtk-glade/dTools/callbacks_4_tileview.cpp rename to src/gtk-glade/dTools/callbacks_4_tileview.cpp diff --git a/desmume/src/gtk-glade/dTools/callbacks_dtools.h b/src/gtk-glade/dTools/callbacks_dtools.h similarity index 100% rename from desmume/src/gtk-glade/dTools/callbacks_dtools.h rename to src/gtk-glade/dTools/callbacks_dtools.h diff --git a/desmume/src/gtk-glade/dTools/dTools_display.h b/src/gtk-glade/dTools/dTools_display.h similarity index 100% rename from desmume/src/gtk-glade/dTools/dTools_display.h rename to src/gtk-glade/dTools/dTools_display.h diff --git a/desmume/src/gtk-glade/desmume-glade.desktop b/src/gtk-glade/desmume-glade.desktop similarity index 100% rename from desmume/src/gtk-glade/desmume-glade.desktop rename to src/gtk-glade/desmume-glade.desktop diff --git a/desmume/src/gtk-glade/desmume.cpp b/src/gtk-glade/desmume.cpp similarity index 100% rename from desmume/src/gtk-glade/desmume.cpp rename to src/gtk-glade/desmume.cpp diff --git a/desmume/src/gtk-glade/desmume.h b/src/gtk-glade/desmume.h similarity index 100% rename from desmume/src/gtk-glade/desmume.h rename to src/gtk-glade/desmume.h diff --git a/desmume/src/gtk-glade/doc/Makefile.am b/src/gtk-glade/doc/Makefile.am similarity index 100% rename from desmume/src/gtk-glade/doc/Makefile.am rename to src/gtk-glade/doc/Makefile.am diff --git a/desmume/src/gtk-glade/doc/desmume-glade.1 b/src/gtk-glade/doc/desmume-glade.1 similarity index 100% rename from desmume/src/gtk-glade/doc/desmume-glade.1 rename to src/gtk-glade/doc/desmume-glade.1 diff --git a/desmume/src/gtk-glade/gdk_3Demu.cpp b/src/gtk-glade/gdk_3Demu.cpp similarity index 100% rename from desmume/src/gtk-glade/gdk_3Demu.cpp rename to src/gtk-glade/gdk_3Demu.cpp diff --git a/desmume/src/gtk-glade/gdk_3Demu.h b/src/gtk-glade/gdk_3Demu.h similarity index 100% rename from desmume/src/gtk-glade/gdk_3Demu.h rename to src/gtk-glade/gdk_3Demu.h diff --git a/desmume/src/gtk-glade/gdk_gl.cpp b/src/gtk-glade/gdk_gl.cpp similarity index 100% rename from desmume/src/gtk-glade/gdk_gl.cpp rename to src/gtk-glade/gdk_gl.cpp diff --git a/desmume/src/gtk-glade/gdk_gl.h b/src/gtk-glade/gdk_gl.h similarity index 100% rename from desmume/src/gtk-glade/gdk_gl.h rename to src/gtk-glade/gdk_gl.h diff --git a/desmume/src/gtk-glade/glade-xml.cpp b/src/gtk-glade/glade-xml.cpp similarity index 100% rename from desmume/src/gtk-glade/glade-xml.cpp rename to src/gtk-glade/glade-xml.cpp diff --git a/desmume/src/gtk-glade/glade/DeSmuME.xpm b/src/gtk-glade/glade/DeSmuME.xpm similarity index 100% rename from desmume/src/gtk-glade/glade/DeSmuME.xpm rename to src/gtk-glade/glade/DeSmuME.xpm diff --git a/desmume/src/gtk-glade/glade/DeSmuMe.glade b/src/gtk-glade/glade/DeSmuMe.glade similarity index 100% rename from desmume/src/gtk-glade/glade/DeSmuMe.glade rename to src/gtk-glade/glade/DeSmuMe.glade diff --git a/desmume/src/gtk-glade/glade/DeSmuMe_Dtools.glade b/src/gtk-glade/glade/DeSmuMe_Dtools.glade similarity index 100% rename from desmume/src/gtk-glade/glade/DeSmuMe_Dtools.glade rename to src/gtk-glade/glade/DeSmuMe_Dtools.glade diff --git a/desmume/src/gtk-glade/globals.h b/src/gtk-glade/globals.h similarity index 100% rename from desmume/src/gtk-glade/globals.h rename to src/gtk-glade/globals.h diff --git a/desmume/src/gtk-glade/keyval_names.cpp b/src/gtk-glade/keyval_names.cpp similarity index 100% rename from desmume/src/gtk-glade/keyval_names.cpp rename to src/gtk-glade/keyval_names.cpp diff --git a/desmume/src/gtk-glade/keyval_names.h b/src/gtk-glade/keyval_names.h similarity index 100% rename from desmume/src/gtk-glade/keyval_names.h rename to src/gtk-glade/keyval_names.h diff --git a/desmume/src/gtk-glade/main.cpp b/src/gtk-glade/main.cpp similarity index 100% rename from desmume/src/gtk-glade/main.cpp rename to src/gtk-glade/main.cpp diff --git a/desmume/src/gtk/DeSmuME.xpm b/src/gtk/DeSmuME.xpm similarity index 100% rename from desmume/src/gtk/DeSmuME.xpm rename to src/gtk/DeSmuME.xpm diff --git a/desmume/src/gtk/Makefile.am b/src/gtk/Makefile.am similarity index 100% rename from desmume/src/gtk/Makefile.am rename to src/gtk/Makefile.am diff --git a/desmume/src/gtk/dTool.h b/src/gtk/dTool.h similarity index 100% rename from desmume/src/gtk/dTool.h rename to src/gtk/dTool.h diff --git a/desmume/src/gtk/dToolsList.cpp b/src/gtk/dToolsList.cpp similarity index 100% rename from desmume/src/gtk/dToolsList.cpp rename to src/gtk/dToolsList.cpp diff --git a/desmume/src/gtk/desmume.cpp b/src/gtk/desmume.cpp similarity index 100% rename from desmume/src/gtk/desmume.cpp rename to src/gtk/desmume.cpp diff --git a/desmume/src/gtk/desmume.desktop b/src/gtk/desmume.desktop similarity index 100% rename from desmume/src/gtk/desmume.desktop rename to src/gtk/desmume.desktop diff --git a/desmume/src/gtk/desmume.h b/src/gtk/desmume.h similarity index 100% rename from desmume/src/gtk/desmume.h rename to src/gtk/desmume.h diff --git a/desmume/src/gtk/doc/Makefile.am b/src/gtk/doc/Makefile.am similarity index 100% rename from desmume/src/gtk/doc/Makefile.am rename to src/gtk/doc/Makefile.am diff --git a/desmume/src/gtk/doc/desmume.1 b/src/gtk/doc/desmume.1 similarity index 100% rename from desmume/src/gtk/doc/desmume.1 rename to src/gtk/doc/desmume.1 diff --git a/desmume/src/gtk/gdk_3Demu.cpp b/src/gtk/gdk_3Demu.cpp similarity index 100% rename from desmume/src/gtk/gdk_3Demu.cpp rename to src/gtk/gdk_3Demu.cpp diff --git a/desmume/src/gtk/gdk_3Demu.h b/src/gtk/gdk_3Demu.h similarity index 100% rename from desmume/src/gtk/gdk_3Demu.h rename to src/gtk/gdk_3Demu.h diff --git a/desmume/src/gtk/main.cpp b/src/gtk/main.cpp similarity index 100% rename from desmume/src/gtk/main.cpp rename to src/gtk/main.cpp diff --git a/desmume/src/gtk/tools/ioregsView.cpp b/src/gtk/tools/ioregsView.cpp similarity index 100% rename from desmume/src/gtk/tools/ioregsView.cpp rename to src/gtk/tools/ioregsView.cpp diff --git a/desmume/src/gtk/tools/ioregsView.h b/src/gtk/tools/ioregsView.h similarity index 100% rename from desmume/src/gtk/tools/ioregsView.h rename to src/gtk/tools/ioregsView.h diff --git a/desmume/src/instruction_tabdef.inc b/src/instruction_tabdef.inc similarity index 100% rename from desmume/src/instruction_tabdef.inc rename to src/instruction_tabdef.inc diff --git a/desmume/src/matrix.cpp b/src/matrix.cpp similarity index 100% rename from desmume/src/matrix.cpp rename to src/matrix.cpp diff --git a/desmume/src/matrix.h b/src/matrix.h similarity index 100% rename from desmume/src/matrix.h rename to src/matrix.h diff --git a/desmume/src/matrix_sse2-x64.asm b/src/matrix_sse2-x64.asm similarity index 100% rename from desmume/src/matrix_sse2-x64.asm rename to src/matrix_sse2-x64.asm diff --git a/desmume/src/matrix_sse2-x86.asm b/src/matrix_sse2-x86.asm similarity index 100% rename from desmume/src/matrix_sse2-x86.asm rename to src/matrix_sse2-x86.asm diff --git a/desmume/src/mc.cpp b/src/mc.cpp similarity index 100% rename from desmume/src/mc.cpp rename to src/mc.cpp diff --git a/desmume/src/mc.h b/src/mc.h similarity index 100% rename from desmume/src/mc.h rename to src/mc.h diff --git a/desmume/src/mem.h b/src/mem.h similarity index 100% rename from desmume/src/mem.h rename to src/mem.h diff --git a/desmume/src/memorystream.h b/src/memorystream.h similarity index 100% rename from desmume/src/memorystream.h rename to src/memorystream.h diff --git a/desmume/src/movie.cpp b/src/movie.cpp similarity index 100% rename from desmume/src/movie.cpp rename to src/movie.cpp diff --git a/desmume/src/movie.h b/src/movie.h similarity index 100% rename from desmume/src/movie.h rename to src/movie.h diff --git a/desmume/src/readwrite.cpp b/src/readwrite.cpp similarity index 100% rename from desmume/src/readwrite.cpp rename to src/readwrite.cpp diff --git a/desmume/src/readwrite.h b/src/readwrite.h similarity index 100% rename from desmume/src/readwrite.h rename to src/readwrite.h diff --git a/desmume/src/registers.h b/src/registers.h similarity index 100% rename from desmume/src/registers.h rename to src/registers.h diff --git a/desmume/src/render3D.cpp b/src/render3D.cpp similarity index 95% rename from desmume/src/render3D.cpp rename to src/render3D.cpp index aa77ef16c..40a0df55b 100644 --- a/desmume/src/render3D.cpp +++ b/src/render3D.cpp @@ -25,7 +25,7 @@ int cur3DCore = GPU3D_NULL; static void NDS_nullFunc1 (void){} static char NDS_nullFunc2 (void){ return 1; } static void NDS_nullFunc3 (int,unsigned short*) {} -static void NDS_nullFunc4 (int,int,int,unsigned short*,unsigned char*) {} +static void NDS_nullFunc4 (int,int,int,unsigned short*) {} GPU3DInterface gpu3DNull = { "None", diff --git a/desmume/src/render3D.h b/src/render3D.h similarity index 96% rename from desmume/src/render3D.h rename to src/render3D.h index 7e2744548..8fcff7cf1 100644 --- a/desmume/src/render3D.h +++ b/src/render3D.h @@ -45,7 +45,7 @@ typedef struct Render3DInterface void (CALL_CONVENTION* NDS_3D_VramReconfigureSignal) (); //Retrieves a line of color buffer data - void (CALL_CONVENTION* NDS_3D_GetLine) (int line, int start, int end_inclusive, unsigned short* dst, unsigned char* dstAlpha); + void (CALL_CONVENTION* NDS_3D_GetLine) (int line, int start, int end_inclusive, unsigned short* dst); //Retrieves a line of color buffer data for capture void (CALL_CONVENTION* NDS_3D_GetLineCaptured) (int line, unsigned short* dst); diff --git a/desmume/src/rtc.cpp b/src/rtc.cpp similarity index 100% rename from desmume/src/rtc.cpp rename to src/rtc.cpp diff --git a/desmume/src/rtc.h b/src/rtc.h similarity index 100% rename from desmume/src/rtc.h rename to src/rtc.h diff --git a/desmume/src/saves.cpp b/src/saves.cpp similarity index 100% rename from desmume/src/saves.cpp rename to src/saves.cpp diff --git a/desmume/src/saves.h b/src/saves.h similarity index 100% rename from desmume/src/saves.h rename to src/saves.h diff --git a/desmume/src/shaders.h b/src/shaders.h similarity index 100% rename from desmume/src/shaders.h rename to src/shaders.h diff --git a/desmume/src/sndsdl.cpp b/src/sndsdl.cpp similarity index 100% rename from desmume/src/sndsdl.cpp rename to src/sndsdl.cpp diff --git a/desmume/src/sndsdl.h b/src/sndsdl.h similarity index 100% rename from desmume/src/sndsdl.h rename to src/sndsdl.h diff --git a/desmume/src/softrender.cpp b/src/softrender.cpp similarity index 100% rename from desmume/src/softrender.cpp rename to src/softrender.cpp diff --git a/desmume/src/softrender.h b/src/softrender.h similarity index 100% rename from desmume/src/softrender.h rename to src/softrender.h diff --git a/desmume/src/softrender_config.h b/src/softrender_config.h similarity index 100% rename from desmume/src/softrender_config.h rename to src/softrender_config.h diff --git a/desmume/src/softrender_desmumefont.h b/src/softrender_desmumefont.h similarity index 100% rename from desmume/src/softrender_desmumefont.h rename to src/softrender_desmumefont.h diff --git a/desmume/src/softrender_v3sysfont.h b/src/softrender_v3sysfont.h similarity index 100% rename from desmume/src/softrender_v3sysfont.h rename to src/softrender_v3sysfont.h diff --git a/desmume/src/thumb_instructions.cpp b/src/thumb_instructions.cpp similarity index 100% rename from desmume/src/thumb_instructions.cpp rename to src/thumb_instructions.cpp diff --git a/desmume/src/thumb_instructions.h b/src/thumb_instructions.h similarity index 100% rename from desmume/src/thumb_instructions.h rename to src/thumb_instructions.h diff --git a/desmume/src/thumb_tabdef.inc b/src/thumb_tabdef.inc similarity index 100% rename from desmume/src/thumb_tabdef.inc rename to src/thumb_tabdef.inc diff --git a/desmume/src/types.h b/src/types.h similarity index 100% rename from desmume/src/types.h rename to src/types.h diff --git a/desmume/src/utils/ConvertUTF.c b/src/utils/ConvertUTF.c similarity index 100% rename from desmume/src/utils/ConvertUTF.c rename to src/utils/ConvertUTF.c diff --git a/desmume/src/utils/ConvertUTF.h b/src/utils/ConvertUTF.h similarity index 100% rename from desmume/src/utils/ConvertUTF.h rename to src/utils/ConvertUTF.h diff --git a/desmume/src/utils/decrypt/crc.cpp b/src/utils/decrypt/crc.cpp similarity index 100% rename from desmume/src/utils/decrypt/crc.cpp rename to src/utils/decrypt/crc.cpp diff --git a/desmume/src/utils/decrypt/crc.h b/src/utils/decrypt/crc.h similarity index 100% rename from desmume/src/utils/decrypt/crc.h rename to src/utils/decrypt/crc.h diff --git a/desmume/src/utils/decrypt/decrypt.cpp b/src/utils/decrypt/decrypt.cpp similarity index 100% rename from desmume/src/utils/decrypt/decrypt.cpp rename to src/utils/decrypt/decrypt.cpp diff --git a/desmume/src/utils/decrypt/decrypt.h b/src/utils/decrypt/decrypt.h similarity index 100% rename from desmume/src/utils/decrypt/decrypt.h rename to src/utils/decrypt/decrypt.h diff --git a/desmume/src/utils/decrypt/header.cpp b/src/utils/decrypt/header.cpp similarity index 100% rename from desmume/src/utils/decrypt/header.cpp rename to src/utils/decrypt/header.cpp diff --git a/desmume/src/utils/decrypt/header.h b/src/utils/decrypt/header.h similarity index 100% rename from desmume/src/utils/decrypt/header.h rename to src/utils/decrypt/header.h diff --git a/desmume/src/utils/guid.cpp b/src/utils/guid.cpp similarity index 100% rename from desmume/src/utils/guid.cpp rename to src/utils/guid.cpp diff --git a/desmume/src/utils/guid.h b/src/utils/guid.h similarity index 100% rename from desmume/src/utils/guid.h rename to src/utils/guid.h diff --git a/desmume/src/utils/md5.cpp b/src/utils/md5.cpp similarity index 100% rename from desmume/src/utils/md5.cpp rename to src/utils/md5.cpp diff --git a/desmume/src/utils/md5.h b/src/utils/md5.h similarity index 100% rename from desmume/src/utils/md5.h rename to src/utils/md5.h diff --git a/desmume/src/utils/valuearray.h b/src/utils/valuearray.h similarity index 100% rename from desmume/src/utils/valuearray.h rename to src/utils/valuearray.h diff --git a/desmume/src/utils/xstring.cpp b/src/utils/xstring.cpp similarity index 100% rename from desmume/src/utils/xstring.cpp rename to src/utils/xstring.cpp diff --git a/desmume/src/utils/xstring.h b/src/utils/xstring.h similarity index 100% rename from desmume/src/utils/xstring.h rename to src/utils/xstring.h diff --git a/desmume/src/wifi.cpp b/src/wifi.cpp similarity index 100% rename from desmume/src/wifi.cpp rename to src/wifi.cpp diff --git a/desmume/src/wifi.h b/src/wifi.h similarity index 100% rename from desmume/src/wifi.h rename to src/wifi.h diff --git a/desmume/src/windows/AboutBox.cpp b/src/windows/AboutBox.cpp similarity index 100% rename from desmume/src/windows/AboutBox.cpp rename to src/windows/AboutBox.cpp diff --git a/desmume/src/windows/AboutBox.h b/src/windows/AboutBox.h similarity index 100% rename from desmume/src/windows/AboutBox.h rename to src/windows/AboutBox.h diff --git a/desmume/src/windows/CWindow.cpp b/src/windows/CWindow.cpp similarity index 100% rename from desmume/src/windows/CWindow.cpp rename to src/windows/CWindow.cpp diff --git a/desmume/src/windows/CWindow.h b/src/windows/CWindow.h similarity index 100% rename from desmume/src/windows/CWindow.h rename to src/windows/CWindow.h diff --git a/desmume/src/windows/DeSmuME.ico b/src/windows/DeSmuME.ico similarity index 100% rename from desmume/src/windows/DeSmuME.ico rename to src/windows/DeSmuME.ico diff --git a/desmume/src/windows/DeSmuME.layout b/src/windows/DeSmuME.layout similarity index 100% rename from desmume/src/windows/DeSmuME.layout rename to src/windows/DeSmuME.layout diff --git a/desmume/src/windows/DeSmuME_2005.vcproj b/src/windows/DeSmuME_2005.vcproj similarity index 100% rename from desmume/src/windows/DeSmuME_2005.vcproj rename to src/windows/DeSmuME_2005.vcproj diff --git a/desmume/src/windows/DeSmuME_2008.vcproj b/src/windows/DeSmuME_2008.vcproj similarity index 100% rename from desmume/src/windows/DeSmuME_2008.vcproj rename to src/windows/DeSmuME_2008.vcproj diff --git a/desmume/src/windows/DeSmuME_Intel.icproj b/src/windows/DeSmuME_Intel.icproj similarity index 100% rename from desmume/src/windows/DeSmuME_Intel.icproj rename to src/windows/DeSmuME_Intel.icproj diff --git a/desmume/src/windows/DeSmuME_Intel.vcproj b/src/windows/DeSmuME_Intel.vcproj similarity index 100% rename from desmume/src/windows/DeSmuME_Intel.vcproj rename to src/windows/DeSmuME_Intel.vcproj diff --git a/desmume/src/windows/DeSmuME_x64.manifest b/src/windows/DeSmuME_x64.manifest similarity index 100% rename from desmume/src/windows/DeSmuME_x64.manifest rename to src/windows/DeSmuME_x64.manifest diff --git a/desmume/src/windows/DeSmuME_x86.manifest b/src/windows/DeSmuME_x86.manifest similarity index 100% rename from desmume/src/windows/DeSmuME_x86.manifest rename to src/windows/DeSmuME_x86.manifest diff --git a/desmume/src/windows/FirmConfig.cpp b/src/windows/FirmConfig.cpp similarity index 100% rename from desmume/src/windows/FirmConfig.cpp rename to src/windows/FirmConfig.cpp diff --git a/desmume/src/windows/FirmConfig.h b/src/windows/FirmConfig.h similarity index 100% rename from desmume/src/windows/FirmConfig.h rename to src/windows/FirmConfig.h diff --git a/desmume/src/windows/GL/glext.h b/src/windows/GL/glext.h similarity index 100% rename from desmume/src/windows/GL/glext.h rename to src/windows/GL/glext.h diff --git a/desmume/src/windows/IORegView.cpp b/src/windows/IORegView.cpp similarity index 100% rename from desmume/src/windows/IORegView.cpp rename to src/windows/IORegView.cpp diff --git a/desmume/src/windows/IORegView.h b/src/windows/IORegView.h similarity index 100% rename from desmume/src/windows/IORegView.h rename to src/windows/IORegView.h diff --git a/desmume/src/windows/Makefile.am b/src/windows/Makefile.am similarity index 100% rename from desmume/src/windows/Makefile.am rename to src/windows/Makefile.am diff --git a/desmume/src/windows/Makefile.win b/src/windows/Makefile.win similarity index 100% rename from desmume/src/windows/Makefile.win rename to src/windows/Makefile.win diff --git a/desmume/src/windows/afxres.h b/src/windows/afxres.h similarity index 100% rename from desmume/src/windows/afxres.h rename to src/windows/afxres.h diff --git a/desmume/src/windows/aviout.cpp b/src/windows/aviout.cpp similarity index 100% rename from desmume/src/windows/aviout.cpp rename to src/windows/aviout.cpp diff --git a/desmume/src/windows/colorctrl.cpp b/src/windows/colorctrl.cpp similarity index 100% rename from desmume/src/windows/colorctrl.cpp rename to src/windows/colorctrl.cpp diff --git a/desmume/src/windows/colorctrl.h b/src/windows/colorctrl.h similarity index 100% rename from desmume/src/windows/colorctrl.h rename to src/windows/colorctrl.h diff --git a/desmume/src/windows/console.cpp b/src/windows/console.cpp similarity index 100% rename from desmume/src/windows/console.cpp rename to src/windows/console.cpp diff --git a/desmume/src/windows/console.h b/src/windows/console.h similarity index 100% rename from desmume/src/windows/console.h rename to src/windows/console.h diff --git a/desmume/src/windows/directx/DxErr8.lib b/src/windows/directx/DxErr8.lib similarity index 100% rename from desmume/src/windows/directx/DxErr8.lib rename to src/windows/directx/DxErr8.lib diff --git a/desmume/src/windows/directx/ddraw.h b/src/windows/directx/ddraw.h similarity index 100% rename from desmume/src/windows/directx/ddraw.h rename to src/windows/directx/ddraw.h diff --git a/desmume/src/windows/directx/ddraw.lib b/src/windows/directx/ddraw.lib similarity index 100% rename from desmume/src/windows/directx/ddraw.lib rename to src/windows/directx/ddraw.lib diff --git a/desmume/src/windows/directx/dinput.h b/src/windows/directx/dinput.h similarity index 100% rename from desmume/src/windows/directx/dinput.h rename to src/windows/directx/dinput.h diff --git a/desmume/src/windows/directx/dinput8.lib b/src/windows/directx/dinput8.lib similarity index 100% rename from desmume/src/windows/directx/dinput8.lib rename to src/windows/directx/dinput8.lib diff --git a/desmume/src/windows/directx/dsound.h b/src/windows/directx/dsound.h similarity index 100% rename from desmume/src/windows/directx/dsound.h rename to src/windows/directx/dsound.h diff --git a/desmume/src/windows/directx/dsound.lib b/src/windows/directx/dsound.lib similarity index 100% rename from desmume/src/windows/directx/dsound.lib rename to src/windows/directx/dsound.lib diff --git a/desmume/src/windows/directx/dxerr8.h b/src/windows/directx/dxerr8.h similarity index 100% rename from desmume/src/windows/directx/dxerr8.h rename to src/windows/directx/dxerr8.h diff --git a/desmume/src/windows/directx/dxguid.lib b/src/windows/directx/dxguid.lib similarity index 100% rename from desmume/src/windows/directx/dxguid.lib rename to src/windows/directx/dxguid.lib diff --git a/desmume/src/windows/disView.cpp b/src/windows/disView.cpp similarity index 100% rename from desmume/src/windows/disView.cpp rename to src/windows/disView.cpp diff --git a/desmume/src/windows/disView.h b/src/windows/disView.h similarity index 100% rename from desmume/src/windows/disView.h rename to src/windows/disView.h diff --git a/desmume/src/windows/ginfo.cpp b/src/windows/ginfo.cpp similarity index 100% rename from desmume/src/windows/ginfo.cpp rename to src/windows/ginfo.cpp diff --git a/desmume/src/windows/ginfo.h b/src/windows/ginfo.h similarity index 100% rename from desmume/src/windows/ginfo.h rename to src/windows/ginfo.h diff --git a/desmume/src/windows/inputdx.cpp b/src/windows/inputdx.cpp similarity index 100% rename from desmume/src/windows/inputdx.cpp rename to src/windows/inputdx.cpp diff --git a/desmume/src/windows/inputdx.h b/src/windows/inputdx.h similarity index 100% rename from desmume/src/windows/inputdx.h rename to src/windows/inputdx.h diff --git a/desmume/src/windows/lightView.cpp b/src/windows/lightView.cpp similarity index 100% rename from desmume/src/windows/lightView.cpp rename to src/windows/lightView.cpp diff --git a/desmume/src/windows/lightView.h b/src/windows/lightView.h similarity index 100% rename from desmume/src/windows/lightView.h rename to src/windows/lightView.h diff --git a/desmume/src/windows/main.cpp b/src/windows/main.cpp similarity index 100% rename from desmume/src/windows/main.cpp rename to src/windows/main.cpp diff --git a/desmume/src/windows/mapView.cpp b/src/windows/mapView.cpp similarity index 100% rename from desmume/src/windows/mapView.cpp rename to src/windows/mapView.cpp diff --git a/desmume/src/windows/mapView.h b/src/windows/mapView.h similarity index 100% rename from desmume/src/windows/mapView.h rename to src/windows/mapView.h diff --git a/desmume/src/windows/matrixView.cpp b/src/windows/matrixView.cpp similarity index 100% rename from desmume/src/windows/matrixView.cpp rename to src/windows/matrixView.cpp diff --git a/desmume/src/windows/matrixView.h b/src/windows/matrixView.h similarity index 100% rename from desmume/src/windows/matrixView.h rename to src/windows/matrixView.h diff --git a/desmume/src/windows/memView.cpp b/src/windows/memView.cpp similarity index 100% rename from desmume/src/windows/memView.cpp rename to src/windows/memView.cpp diff --git a/desmume/src/windows/memView.h b/src/windows/memView.h similarity index 100% rename from desmume/src/windows/memView.h rename to src/windows/memView.h diff --git a/desmume/src/windows/oamView.cpp b/src/windows/oamView.cpp similarity index 100% rename from desmume/src/windows/oamView.cpp rename to src/windows/oamView.cpp diff --git a/desmume/src/windows/oamView.h b/src/windows/oamView.h similarity index 100% rename from desmume/src/windows/oamView.h rename to src/windows/oamView.h diff --git a/desmume/src/windows/ogl.cpp b/src/windows/ogl.cpp similarity index 100% rename from desmume/src/windows/ogl.cpp rename to src/windows/ogl.cpp diff --git a/desmume/src/windows/palView.cpp b/src/windows/palView.cpp similarity index 100% rename from desmume/src/windows/palView.cpp rename to src/windows/palView.cpp diff --git a/desmume/src/windows/palView.h b/src/windows/palView.h similarity index 100% rename from desmume/src/windows/palView.h rename to src/windows/palView.h diff --git a/desmume/src/windows/resource.h b/src/windows/resource.h similarity index 100% rename from desmume/src/windows/resource.h rename to src/windows/resource.h diff --git a/desmume/src/windows/resources.rc b/src/windows/resources.rc similarity index 100% rename from desmume/src/windows/resources.rc rename to src/windows/resources.rc diff --git a/desmume/src/windows/snddx.cpp b/src/windows/snddx.cpp similarity index 100% rename from desmume/src/windows/snddx.cpp rename to src/windows/snddx.cpp diff --git a/desmume/src/windows/snddx.h b/src/windows/snddx.h similarity index 100% rename from desmume/src/windows/snddx.h rename to src/windows/snddx.h diff --git a/desmume/src/windows/throttle.cpp b/src/windows/throttle.cpp similarity index 100% rename from desmume/src/windows/throttle.cpp rename to src/windows/throttle.cpp diff --git a/desmume/src/windows/throttle.h b/src/windows/throttle.h similarity index 100% rename from desmume/src/windows/throttle.h rename to src/windows/throttle.h diff --git a/desmume/src/windows/tileView.cpp b/src/windows/tileView.cpp similarity index 100% rename from desmume/src/windows/tileView.cpp rename to src/windows/tileView.cpp diff --git a/desmume/src/windows/tileView.h b/src/windows/tileView.h similarity index 100% rename from desmume/src/windows/tileView.h rename to src/windows/tileView.h diff --git a/desmume/src/windows/windriver.h b/src/windows/windriver.h similarity index 100% rename from desmume/src/windows/windriver.h rename to src/windows/windriver.h diff --git a/desmume/src/windows/zlib123/README b/src/windows/zlib123/README similarity index 100% rename from desmume/src/windows/zlib123/README rename to src/windows/zlib123/README diff --git a/desmume/src/windows/zlib123/zconf.h b/src/windows/zlib123/zconf.h similarity index 100% rename from desmume/src/windows/zlib123/zconf.h rename to src/windows/zlib123/zconf.h diff --git a/desmume/src/windows/zlib123/zlib-2005-x32.lib b/src/windows/zlib123/zlib-2005-x32.lib similarity index 100% rename from desmume/src/windows/zlib123/zlib-2005-x32.lib rename to src/windows/zlib123/zlib-2005-x32.lib diff --git a/desmume/src/windows/zlib123/zlib-2005-x64.lib b/src/windows/zlib123/zlib-2005-x64.lib similarity index 100% rename from desmume/src/windows/zlib123/zlib-2005-x64.lib rename to src/windows/zlib123/zlib-2005-x64.lib diff --git a/desmume/src/windows/zlib123/zlib-2008-x32.lib b/src/windows/zlib123/zlib-2008-x32.lib similarity index 100% rename from desmume/src/windows/zlib123/zlib-2008-x32.lib rename to src/windows/zlib123/zlib-2008-x32.lib diff --git a/desmume/src/windows/zlib123/zlib-2008-x64.lib b/src/windows/zlib123/zlib-2008-x64.lib similarity index 100% rename from desmume/src/windows/zlib123/zlib-2008-x64.lib rename to src/windows/zlib123/zlib-2008-x64.lib diff --git a/desmume/src/windows/zlib123/zlib.h b/src/windows/zlib123/zlib.h similarity index 100% rename from desmume/src/windows/zlib123/zlib.h rename to src/windows/zlib123/zlib.h diff --git a/desmume/src/windows/zlib123/zutil.h b/src/windows/zlib123/zutil.h similarity index 100% rename from desmume/src/windows/zlib123/zutil.h rename to src/windows/zlib123/zutil.h diff --git a/desmume/src/windows/zziplib/README b/src/windows/zziplib/README similarity index 100% rename from desmume/src/windows/zziplib/README rename to src/windows/zziplib/README diff --git a/desmume/src/windows/zziplib/zzip/_msvc.h b/src/windows/zziplib/zzip/_msvc.h similarity index 100% rename from desmume/src/windows/zziplib/zzip/_msvc.h rename to src/windows/zziplib/zzip/_msvc.h diff --git a/desmume/src/windows/zziplib/zzip/conf.h b/src/windows/zziplib/zzip/conf.h similarity index 100% rename from desmume/src/windows/zziplib/zzip/conf.h rename to src/windows/zziplib/zzip/conf.h diff --git a/desmume/src/windows/zziplib/zzip/types.h b/src/windows/zziplib/zzip/types.h similarity index 100% rename from desmume/src/windows/zziplib/zzip/types.h rename to src/windows/zziplib/zzip/types.h diff --git a/desmume/src/windows/zziplib/zzip/zzip.h b/src/windows/zziplib/zzip/zzip.h similarity index 100% rename from desmume/src/windows/zziplib/zzip/zzip.h rename to src/windows/zziplib/zzip/zzip.h diff --git a/desmume/src/windows/zziplib/zziplib-2005-x32.lib b/src/windows/zziplib/zziplib-2005-x32.lib similarity index 100% rename from desmume/src/windows/zziplib/zziplib-2005-x32.lib rename to src/windows/zziplib/zziplib-2005-x32.lib diff --git a/desmume/src/windows/zziplib/zziplib-2005-x64.lib b/src/windows/zziplib/zziplib-2005-x64.lib similarity index 100% rename from desmume/src/windows/zziplib/zziplib-2005-x64.lib rename to src/windows/zziplib/zziplib-2005-x64.lib diff --git a/desmume/src/windows/zziplib/zziplib-2008-x32.lib b/src/windows/zziplib/zziplib-2008-x32.lib similarity index 100% rename from desmume/src/windows/zziplib/zziplib-2008-x32.lib rename to src/windows/zziplib/zziplib-2008-x32.lib diff --git a/desmume/src/windows/zziplib/zziplib-2008-x64.lib b/src/windows/zziplib/zziplib-2008-x64.lib similarity index 100% rename from desmume/src/windows/zziplib/zziplib-2008-x64.lib rename to src/windows/zziplib/zziplib-2008-x64.lib diff --git a/desmume/src/zero_private.h b/src/zero_private.h similarity index 100% rename from desmume/src/zero_private.h rename to src/zero_private.h