diff --git a/desmume/src/GPU.cpp b/desmume/src/GPU.cpp index 957895dae..6a39d8472 100644 --- a/desmume/src/GPU.cpp +++ b/desmume/src/GPU.cpp @@ -2443,4 +2443,4 @@ bool gpu_loadstate(std::istream* is) { is->read((char*)GPU_screen,sizeof(GPU_screen)); return !is->fail(); -} \ No newline at end of file +} diff --git a/desmume/src/config.h b/desmume/src/config.h deleted file mode 100644 index 2f2f707ee..000000000 --- a/desmume/src/config.h +++ /dev/null @@ -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 - -#include "debug.h" - -#endif /*__CONFIG_H__*/ - diff --git a/desmume/src/readwrite.cpp b/desmume/src/readwrite.cpp index d566587f4..554770a0a 100644 --- a/desmume/src/readwrite.cpp +++ b/desmume/src/readwrite.cpp @@ -114,4 +114,4 @@ int read16le(char *d, FILE *fp) ret+=fread(d,1,1,fp); return ret<2?0:2; #endif -} \ No newline at end of file +} diff --git a/desmume/src/saves.cpp b/desmume/src/saves.cpp index f6ab2cd7e..1fa7a17c0 100644 --- a/desmume/src/saves.cpp +++ b/desmume/src/saves.cpp @@ -573,6 +573,10 @@ bool savestate_load(std::istream* is) std::vector buf(len); if(comprlen != 0xFFFFFFFF) { +#ifndef HAVE_LIBZ + //without libz, we can't decompress this savestate + return false; +#endif std::vector cbuf(comprlen); is->read(&cbuf[0],comprlen); if(is->fail()) return false; diff --git a/desmume/src/windows/DeSmuME_2005.vcproj b/desmume/src/windows/DeSmuME_2005.vcproj index b7126d501..afbb7d322 100644 --- a/desmume/src/windows/DeSmuME_2005.vcproj +++ b/desmume/src/windows/DeSmuME_2005.vcproj @@ -545,44 +545,38 @@ - - - - - - + + + + - - - - + + + + @@ -673,361 +667,16 @@ RelativePath=".\mapView.cpp" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/desmume/src/fs-windows.cpp b/desmume/src/windows/fs-windows.cpp similarity index 100% rename from desmume/src/fs-windows.cpp rename to desmume/src/windows/fs-windows.cpp diff --git a/desmume/src/windows/yopyop_private.h b/desmume/src/windows/yopyop_private.h deleted file mode 100644 index 18278bb4f..000000000 --- a/desmume/src/windows/yopyop_private.h +++ /dev/null @@ -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*/ diff --git a/desmume/src/windows/yopyop_private.rc b/desmume/src/windows/yopyop_private.rc deleted file mode 100644 index 96a76f508..000000000 --- a/desmume/src/windows/yopyop_private.rc +++ /dev/null @@ -1,38 +0,0 @@ -/* THIS FILE WILL BE OVERWRITTEN BY DEV-C++ */ -/* DO NOT EDIT! */ - -#include // 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 - } -} -