some source code cleanup and reorg of the vs8 vcproj which was driving me insane

This commit is contained in:
zeromus 2008-09-23 02:24:26 +00:00
parent 58b3e24df7
commit bc8944701f
8 changed files with 398 additions and 509 deletions

View File

@ -2443,4 +2443,4 @@ bool gpu_loadstate(std::istream* is)
{
is->read((char*)GPU_screen,sizeof(GPU_screen));
return !is->fail();
}
}

View File

@ -1,28 +0,0 @@
/* Copyright (C) 2006 thoduv
This file is part of DeSmuME
DeSmuME is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
DeSmuME is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with DeSmuME; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef __CONFIG_H__
#define __CONFIG_H__
#include <stdio.h>
#include "debug.h"
#endif /*__CONFIG_H__*/

View File

@ -114,4 +114,4 @@ int read16le(char *d, FILE *fp)
ret+=fread(d,1,1,fp);
return ret<2?0:2;
#endif
}
}

View File

@ -573,6 +573,10 @@ bool savestate_load(std::istream* is)
std::vector<char> buf(len);
if(comprlen != 0xFFFFFFFF) {
#ifndef HAVE_LIBZ
//without libz, we can't decompress this savestate
return false;
#endif
std::vector<char> cbuf(comprlen);
is->read(&cbuf[0],comprlen);
if(is->fail()) return false;

View File

@ -545,44 +545,38 @@
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Name="windows"
>
<File
RelativePath=".\AboutBox.cpp"
>
</File>
<File
RelativePath="..\arm_instructions.cpp"
>
</File>
<File
RelativePath="..\armcpu.cpp"
>
</File>
<File
RelativePath="..\bios.cpp"
>
</File>
<File
RelativePath="..\cflash.cpp"
RelativePath=".\AboutBox.h"
>
</File>
<File
RelativePath=".\colorctrl.cpp"
>
</File>
<File
RelativePath=".\colorctrl.h"
>
</File>
<File
RelativePath=".\ConfigKeys.cpp"
>
</File>
<File
RelativePath=".\ConfigKeys.h"
>
</File>
<File
RelativePath=".\console.cpp"
>
</File>
<File
RelativePath="..\cp15.cpp"
RelativePath=".\console.h"
>
</File>
<File
@ -590,11 +584,11 @@
>
</File>
<File
RelativePath="..\debug.cpp"
RelativePath=".\CWindow.h"
>
</File>
<File
RelativePath="..\Disassembler.cpp"
RelativePath=".\DeSmuME.ico"
>
</File>
<File
@ -602,7 +596,7 @@
>
</File>
<File
RelativePath="..\FIFO.cpp"
RelativePath=".\disView.h"
>
</File>
<File
@ -610,15 +604,11 @@
>
</File>
<File
RelativePath="..\fs-windows.cpp"
RelativePath=".\FirmConfig.h"
>
</File>
<File
RelativePath="..\gdbstub\gdbstub.cpp"
>
</File>
<File
RelativePath="..\gfx3d.cpp"
RelativePath=".\fs-windows.cpp"
>
</File>
<File
@ -626,21 +616,25 @@
>
</File>
<File
RelativePath="..\GPU.cpp"
>
</File>
<File
RelativePath="..\GPU_osd.cpp"
RelativePath=".\ginfo.h"
>
</File>
<File
RelativePath=".\IORegView.cpp"
>
</File>
<File
RelativePath=".\IORegView.h"
>
</File>
<File
RelativePath=".\lightView.cpp"
>
</File>
<File
RelativePath=".\lightView.h"
>
</File>
<File
RelativePath=".\main.cpp"
>
@ -673,361 +667,16 @@
RelativePath=".\mapView.cpp"
>
</File>
<File
RelativePath="..\matrix.cpp"
>
</File>
<File
RelativePath="..\matrix_sse2-x64.asm"
>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="MASM"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
Description="Assembling..."
CommandLine="ml64 /nologo /c /Zi /Fo&quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj"
/>
</FileConfiguration>
<FileConfiguration
Name="Release (SSE2)|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
Description="Assembling..."
CommandLine="ml64 /nologo /c /Zi /Fo&quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
Name="MASM"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
Description="Assembling..."
CommandLine="ml64 /nologo /c /Zi /Fo&quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj"
/>
</FileConfiguration>
<FileConfiguration
Name="Release (SSE2)|x64"
>
<Tool
Name="VCCustomBuildTool"
Description="Assembling..."
CommandLine="ml64 /nologo /c /Zi /Fo&quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\matrix_sse2-x86.asm"
>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="MASM"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="MASM"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
Name="MASM"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"
>
<Tool
Name="MASM"
/>
</FileConfiguration>
<FileConfiguration
Name="Release (SSE2)|x64"
ExcludedFromBuild="true"
>
<Tool
Name="MASM"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\matrixView.cpp"
>
</File>
<File
RelativePath="..\mc.cpp"
>
</File>
<File
RelativePath=".\memView.cpp"
>
</File>
<File
RelativePath="..\MMU.cpp"
>
</File>
<File
RelativePath="..\NDSSystem.cpp"
>
</File>
<File
RelativePath=".\oamView.cpp"
>
</File>
<File
RelativePath=".\ogl.cpp"
>
</File>
<File
RelativePath="..\OGLRender.cpp"
>
</File>
<File
RelativePath=".\palView.cpp"
>
</File>
<File
RelativePath="..\readwrite.cpp"
>
</File>
<File
RelativePath="..\readwrite.h"
>
</File>
<File
RelativePath="..\render3D.cpp"
>
</File>
<File
RelativePath="..\ROMReader.cpp"
>
<FileConfiguration
Name="Release (SSE2)|Win32"
>
<Tool
Name="VCCLCompilerTool"
CallingConvention="1"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\saves.cpp"
>
<FileConfiguration
Name="Release (SSE2)|Win32"
>
<Tool
Name="VCCLCompilerTool"
CallingConvention="1"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\snddx.cpp"
>
</File>
<File
RelativePath="..\SPU.cpp"
>
</File>
<File
RelativePath=".\throttle.cpp"
>
</File>
<File
RelativePath="..\thumb_instructions.cpp"
>
</File>
<File
RelativePath=".\tileView.cpp"
>
</File>
<File
RelativePath="..\wifi.cpp"
>
</File>
<Filter
Name="windows"
>
</Filter>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath=".\AboutBox.h"
>
</File>
<File
RelativePath="..\ARM9.h"
>
</File>
<File
RelativePath="..\arm_instructions.h"
>
</File>
<File
RelativePath="..\armcpu.h"
>
</File>
<File
RelativePath="..\bios.h"
>
</File>
<File
RelativePath="..\bits.h"
>
</File>
<File
RelativePath="..\cflash.h"
>
</File>
<File
RelativePath=".\colorconv.h"
>
</File>
<File
RelativePath=".\colorctrl.h"
>
</File>
<File
RelativePath="..\config.h"
>
</File>
<File
RelativePath=".\ConfigKeys.h"
>
</File>
<File
RelativePath=".\console.h"
>
</File>
<File
RelativePath="..\cp15.h"
>
</File>
<File
RelativePath=".\CWindow.h"
>
</File>
<File
RelativePath="..\debug.h"
>
</File>
<File
RelativePath="..\Disassembler.h"
>
</File>
<File
RelativePath=".\disView.h"
>
</File>
<File
RelativePath="..\dscard.h"
>
</File>
<File
RelativePath="..\fat.h"
>
</File>
<File
RelativePath="..\FIFO.h"
>
</File>
<File
RelativePath=".\FirmConfig.h"
>
</File>
<File
RelativePath="..\fs.h"
>
</File>
<File
RelativePath="..\gdbstub.h"
>
</File>
<File
RelativePath="..\gdbstub\gdbstub_internal.h"
>
</File>
<File
RelativePath="..\gfx3d.h"
>
</File>
<File
RelativePath=".\ginfo.h"
>
</File>
<File
RelativePath="..\GPU.h"
>
</File>
<File
RelativePath="..\GPU_osd.h"
>
</File>
<File
RelativePath=".\IORegView.h"
>
</File>
<File
RelativePath=".\lightView.h"
>
</File>
<File
RelativePath=".\mapView.h"
>
</File>
<File
RelativePath="..\matrix.h"
>
</File>
<File
RelativePath=".\matrixView.h"
>
</File>
<File
RelativePath="..\mc.h"
>
</File>
<File
RelativePath="..\mem.h"
RelativePath=".\memView.cpp"
>
</File>
<File
@ -1035,11 +684,7 @@
>
</File>
<File
RelativePath="..\MMU.h"
>
</File>
<File
RelativePath="..\NDSSystem.h"
RelativePath=".\oamView.cpp"
>
</File>
<File
@ -1047,31 +692,27 @@
>
</File>
<File
RelativePath="..\OGLRender.h"
RelativePath=".\ogl.cpp"
>
</File>
<File
RelativePath=".\palView.cpp"
>
</File>
<File
RelativePath=".\palView.h"
>
</File>
<File
RelativePath="..\registers.h"
>
</File>
<File
RelativePath=".\resource.h"
>
</File>
<File
RelativePath=".\resrc1.h"
RelativePath=".\resources.rc"
>
</File>
<File
RelativePath="..\ROMReader.h"
>
</File>
<File
RelativePath="..\saves.h"
RelativePath=".\snddx.cpp"
>
</File>
<File
@ -1079,7 +720,7 @@
>
</File>
<File
RelativePath="..\SPU.h"
RelativePath=".\throttle.cpp"
>
</File>
<File
@ -1087,40 +728,373 @@
>
</File>
<File
RelativePath="..\thumb_instructions.h"
RelativePath=".\tileView.cpp"
>
</File>
<File
RelativePath=".\tileView.h"
>
</File>
<File
RelativePath="..\types.h"
>
</File>
<File
RelativePath="..\wifi.h"
>
</File>
<File
RelativePath=".\yopyop_private.h"
>
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
<File
RelativePath="..\ARM9.h"
>
<File
RelativePath=".\DeSmuME.ico"
</File>
<File
RelativePath="..\arm_instructions.cpp"
>
</File>
<File
RelativePath="..\arm_instructions.h"
>
</File>
<File
RelativePath="..\armcpu.cpp"
>
</File>
<File
RelativePath="..\armcpu.h"
>
</File>
<File
RelativePath="..\bios.cpp"
>
</File>
<File
RelativePath="..\bios.h"
>
</File>
<File
RelativePath="..\bits.h"
>
</File>
<File
RelativePath="..\cflash.cpp"
>
</File>
<File
RelativePath="..\cflash.h"
>
</File>
<File
RelativePath=".\colorconv.h"
>
</File>
<File
RelativePath="..\config.h"
>
</File>
<File
RelativePath="..\cp15.cpp"
>
</File>
<File
RelativePath="..\cp15.h"
>
</File>
<File
RelativePath="..\debug.cpp"
>
</File>
<File
RelativePath="..\debug.h"
>
</File>
<File
RelativePath="..\Disassembler.cpp"
>
</File>
<File
RelativePath="..\Disassembler.h"
>
</File>
<File
RelativePath="..\dscard.h"
>
</File>
<File
RelativePath="..\fat.h"
>
</File>
<File
RelativePath="..\FIFO.cpp"
>
</File>
<File
RelativePath="..\FIFO.h"
>
</File>
<File
RelativePath="..\fs.h"
>
</File>
<File
RelativePath="..\gdbstub\gdbstub.cpp"
>
</File>
<File
RelativePath="..\gdbstub.h"
>
</File>
<File
RelativePath="..\gdbstub\gdbstub_internal.h"
>
</File>
<File
RelativePath="..\gfx3d.cpp"
>
</File>
<File
RelativePath="..\gfx3d.h"
>
</File>
<File
RelativePath="..\GPU.cpp"
>
</File>
<File
RelativePath="..\GPU.h"
>
</File>
<File
RelativePath="..\GPU_osd.cpp"
>
</File>
<File
RelativePath="..\GPU_osd.h"
>
</File>
<File
RelativePath="..\matrix.cpp"
>
</File>
<File
RelativePath="..\matrix.h"
>
</File>
<File
RelativePath="..\matrix_sse2-x64.asm"
>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
</File>
<File
RelativePath=".\resources.rc"
<Tool
Name="MASM"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
</File>
</Filter>
<Tool
Name="VCCustomBuildTool"
Description="Assembling..."
CommandLine="ml64 /nologo /c /Zi /Fo&quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj"
/>
</FileConfiguration>
<FileConfiguration
Name="Release (SSE2)|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
Description="Assembling..."
CommandLine="ml64 /nologo /c /Zi /Fo&quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
Name="MASM"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
Description="Assembling..."
CommandLine="ml64 /nologo /c /Zi /Fo&quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj"
/>
</FileConfiguration>
<FileConfiguration
Name="Release (SSE2)|x64"
>
<Tool
Name="VCCustomBuildTool"
Description="Assembling..."
CommandLine="ml64 /nologo /c /Zi /Fo&quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\matrix_sse2-x86.asm"
>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="MASM"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="MASM"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
Name="MASM"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"
>
<Tool
Name="MASM"
/>
</FileConfiguration>
<FileConfiguration
Name="Release (SSE2)|x64"
ExcludedFromBuild="true"
>
<Tool
Name="MASM"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\matrixView.cpp"
>
</File>
<File
RelativePath="..\mc.cpp"
>
</File>
<File
RelativePath="..\mc.h"
>
</File>
<File
RelativePath="..\mem.h"
>
</File>
<File
RelativePath="..\MMU.cpp"
>
</File>
<File
RelativePath="..\MMU.h"
>
</File>
<File
RelativePath="..\NDSSystem.cpp"
>
</File>
<File
RelativePath="..\NDSSystem.h"
>
</File>
<File
RelativePath="..\OGLRender.cpp"
>
</File>
<File
RelativePath="..\OGLRender.h"
>
</File>
<File
RelativePath="..\readwrite.cpp"
>
</File>
<File
RelativePath="..\readwrite.h"
>
</File>
<File
RelativePath="..\registers.h"
>
</File>
<File
RelativePath="..\render3D.cpp"
>
</File>
<File
RelativePath="..\ROMReader.cpp"
>
<FileConfiguration
Name="Release (SSE2)|Win32"
>
<Tool
Name="VCCLCompilerTool"
CallingConvention="1"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\ROMReader.h"
>
</File>
<File
RelativePath="..\saves.cpp"
>
<FileConfiguration
Name="Release (SSE2)|Win32"
>
<Tool
Name="VCCLCompilerTool"
CallingConvention="1"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\saves.h"
>
</File>
<File
RelativePath="..\SPU.cpp"
>
</File>
<File
RelativePath="..\SPU.h"
>
</File>
<File
RelativePath="..\thumb_instructions.cpp"
>
</File>
<File
RelativePath="..\thumb_instructions.h"
>
</File>
<File
RelativePath="..\types.h"
>
</File>
<File
RelativePath="..\wifi.cpp"
>
</File>
<File
RelativePath="..\wifi.h"
>
</File>
</Files>
<Globals>
</Globals>

View File

@ -1,23 +0,0 @@
/* THIS FILE WILL BE OVERWRITTEN BY DEV-C++ */
/* DO NOT EDIT ! */
#ifndef YOPYOP_PRIVATE_H
#define YOPYOP_PRIVATE_H
/* VERSION DEFINITIONS */
#define VER_STRING "0.0.7.0"
#define VER_MAJOR 0
#define VER_MINOR 0
#define VER_RELEASE 7
#define VER_BUILD 0
#define COMPANY_NAME "yopyop"
#define FILE_VERSION ""
#define FILE_DESCRIPTION "NDS(tm) emulator"
#define INTERNAL_NAME ""
#define LEGAL_COPYRIGHT ""
#define LEGAL_TRADEMARKS ""
#define ORIGINAL_FILENAME ""
#define PRODUCT_NAME "DeSmuME"
#define PRODUCT_VERSION ""
#endif /*YOPYOP_PRIVATE_H*/

View File

@ -1,38 +0,0 @@
/* THIS FILE WILL BE OVERWRITTEN BY DEV-C++ */
/* DO NOT EDIT! */
#include <windows.h> // include for version info constants
#include "resources.rc"
A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "DeSmuME.ico"
//
// TO CHANGE VERSION INFORMATION, EDIT PROJECT OPTIONS...
//
1 VERSIONINFO
FILEVERSION 0,0,3,4
PRODUCTVERSION 0,0,3,4
FILETYPE VFT_APP
{
BLOCK "StringFileInfo"
{
BLOCK "140904E4"
{
VALUE "CompanyName", "yopyop"
VALUE "FileVersion", ""
VALUE "FileDescription", "NDS(tm) emulator"
VALUE "InternalName", ""
VALUE "LegalCopyright", ""
VALUE "LegalTrademarks", ""
VALUE "OriginalFilename", ""
VALUE "ProductName", "DeSmuME"
VALUE "ProductVersion", ""
}
}
BLOCK "VarFileInfo"
{
VALUE "Translation", 0x1409, 1252
}
}