diff --git a/desmume/src/windows/DeSmuME_2005.vcproj b/desmume/src/windows/DeSmuME_2005.vcproj index ea512d19f..8f599c4b4 100644 --- a/desmume/src/windows/DeSmuME_2005.vcproj +++ b/desmume/src/windows/DeSmuME_2005.vcproj @@ -55,7 +55,7 @@ EnableFiberSafeOptimizations="false" WholeProgramOptimization="false" AdditionalIncludeDirectories=".;..;"lua\lua-5.1.4\src";"glib-2.20.1\build";"glib-2.20.1\build\glib";.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples" - PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;DEBUG;_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;SPU_INTERPOLATE;HAVE_LIBZ;HAVE_LIBZZIP;NOMINMAX;_WIN32_WINNT=0x0501" + PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;DEBUG;_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;_WIN32_WINNT=0x0501" ExceptionHandling="1" BasicRuntimeChecks="0" BufferSecurityCheck="true" @@ -78,7 +78,7 @@ /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - @@ -1037,6 +1019,15 @@ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" /> + + + @@ -1046,6 +1037,15 @@ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" /> + + + @@ -1318,7 +1318,7 @@ /> + + @@ -1035,10 +1039,6 @@ RelativePath="..\utils\xstring.cpp" > - - diff --git a/desmume/src/windows/DeSmuME_2010.sln b/desmume/src/windows/DeSmuME_2010.sln deleted file mode 100644 index fad4cb2e8..000000000 --- a/desmume/src/windows/DeSmuME_2010.sln +++ /dev/null @@ -1,23 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 10 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DeSmuME_VS2010", "DeSmuME_2010.vcxproj", "{9F5F72A1-D3A5-4918-B460-E076B16D10A9}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release FastBuild|Win32 = Release FastBuild|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|Win32.ActiveCfg = Debug|Win32 - {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|Win32.Build.0 = Debug|Win32 - {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release FastBuild|Win32.ActiveCfg = Release FastBuild|Win32 - {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release FastBuild|Win32.Build.0 = Release FastBuild|Win32 - {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|Win32.ActiveCfg = Release|Win32 - {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/desmume/src/windows/DeSmuME_2010.vcxproj b/desmume/src/windows/DeSmuME_2010.vcxproj deleted file mode 100644 index 6a5bb3544..000000000 --- a/desmume/src/windows/DeSmuME_2010.vcxproj +++ /dev/null @@ -1,379 +0,0 @@ - - - - Debug - Win32 - - - Release FastBuild - Win32 - - - Release - Win32 - - - - DeSmuME_VS2010 - {9F5F72A1-D3A5-4918-B460-E076B16D10A9} - DeSmuME - - - - Application - - - Application - true - - - Application - false - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.20506.1 - $(SolutionDir)\__bins\ - $(SolutionDir)\.VS2010\$(Configuration)\$(Platform)\ - $(ProjectName)_debug - .exe - $(SolutionDir)\__bins\ - $(SolutionDir)\.VS2010\$(Configuration)\$(Platform)\ - $(ProjectName)_release - .exe - $(SolutionDir)\__bins\ - $(SolutionDir)\.VS2010\$(Configuration)\$(Platform)\ - $(ProjectName)_releaseFastBuild - .exe - - - - defaultconfig\SubWCRev.bat - - - Disabled - Disabled - false - Neither - false - false - ..\windows;..\..\src;.\lua\lua-5.1.4\src;.\glib-2.20.1\build;.\glib-2.20.1\build\glib;.\zlib123;.\zziplib;.\winpcap;.\userconfig;.\defaultconfig;.\7z;.\%(AdditionalIncludeDirectories);.\agg\include - DEBUG;_CRT_SECURE_NO_DEPRECATE;WIN32;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX;EXPERIMENTAL_WIFI;HAVE_LIBZ;HAVE_LIBZZIP;%(PreprocessorDefinitions) - Sync - EnableFastChecks - true - StreamingSIMDExtensions2 - Fast - EditAndContinue - Cdecl - Default - - - lua-5.1.4-x86d.lib;glib-2.20.1-x86.lib;vfw32.lib;winmm.lib;opengl32.lib;glu32.lib;ws2_32.lib;user32.lib;gdi32.lib;directx\dxguid.lib;shell32.lib;comdlg32.lib;directx\dxerr8.lib;directx\dsound.lib;directx\dinput8.lib;directx\ddraw.lib;zlib-2005-x32.lib;zziplib-2005-x32.lib;shlwapi.lib;winpcap\wpcap.lib;7zip.lib;%(AdditionalDependencies);comctl32.lib - .\zlib123;.\zziplib;glib-2.20.1\lib;lua\lib;.\7z;.\agg;%(AdditionalLibraryDirectories) - wpcap.dll;%(DelayLoadDLLs) - true - true - false - - - - - DeSmuME_x86.manifest;%(AdditionalManifestFiles) - - - - - defaultconfig\SubWCRev.bat - - - MaxSpeed - AnySuitable - true - Speed - true - true - true - ..\windows;..\..\src;.\lua\lua-5.1.4\src;.\glib-2.20.1\build;.\glib-2.20.1\build\glib;.\zlib123;.\zziplib;.\winpcap;.\userconfig;.\defaultconfig;.\%(AdditionalIncludeDirectories);.\agg\include - _CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;SPU_INTERPOLATE;NOMINMAX;RELEASE;EXPERIMENTAL_WIFI;NDEBUG;%(PreprocessorDefinitions) - true - Sync - Default - false - StreamingSIMDExtensions2 - Fast - Level1 - ProgramDatabase - Cdecl - Default - - - lua-5.1.4-x86.lib;glib-2.20.1-x86.lib;vfw32.lib;winmm.lib;opengl32.lib;glu32.lib;ws2_32.lib;user32.lib;gdi32.lib;directx\dxguid.lib;shell32.lib;comdlg32.lib;directx\dxerr8.lib;directx\dsound.lib;directx\dinput8.lib;directx\ddraw.lib;zlib-2005-x32.lib;zziplib-2005-x32.lib;shlwapi.lib;winpcap\wpcap.lib;7zip.lib;%(AdditionalDependencies);comctl32.lib - .\zlib123;.\zziplib;glib-2.20.1\lib;lua\lib;.\7z;.\agg;%(AdditionalLibraryDirectories) - wpcap.dll;%(DelayLoadDLLs) - true - true - false - - - false - - - DeSmuME_x86.manifest;%(AdditionalManifestFiles) - - - - - defaultconfig\SubWCRev.bat - - - MaxSpeed - AnySuitable - true - Speed - true - true - false - ..\windows;..\..\src;.\lua\lua-5.1.4\src;.\glib-2.20.1\build;.\glib-2.20.1\build\glib;.\zlib123;.\zziplib;.\winpcap;.\userconfig;.\defaultconfig;.\7z;.\%(AdditionalIncludeDirectories);.\agg\include - _CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;SPU_INTERPOLATE;NOMINMAX;RELEASE;EXPERIMENTAL_WIFI;NDEBUG;%(PreprocessorDefinitions) - true - Sync - Default - false - StreamingSIMDExtensions2 - Fast - Level1 - ProgramDatabase - Cdecl - Default - - - lua-5.1.4-x86.lib;glib-2.20.1-x86.lib;vfw32.lib;winmm.lib;opengl32.lib;glu32.lib;ws2_32.lib;user32.lib;gdi32.lib;directx\dxguid.lib;shell32.lib;comdlg32.lib;directx\dxerr8.lib;directx\dsound.lib;directx\dinput8.lib;directx\ddraw.lib;zlib-2005-x32.lib;zziplib-2005-x32.lib;shlwapi.lib;winpcap\wpcap.lib;7zip.lib;agg-2.5.lib;comctl32.lib;%(AdditionalDependencies);comctl32.lib - .\zlib123;.\zziplib;glib-2.20.1\lib;lua\lib;.\7z;.\agg;%(AdditionalLibraryDirectories) - wpcap.dll;%(DelayLoadDLLs) - true - true - - - false - - - false - - - DeSmuME_x86.manifest;%(AdditionalManifestFiles) - - - - - - - - - - - - - - - - - Cdecl - Cdecl - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/desmume/src/windows/DeSmuME_2010.vcxproj.filters b/desmume/src/windows/DeSmuME_2010.vcxproj.filters deleted file mode 100644 index 965ab1e4e..000000000 --- a/desmume/src/windows/DeSmuME_2010.vcxproj.filters +++ /dev/null @@ -1,586 +0,0 @@ - - - - - {e246e968-7cf0-4440-8af1-2ca31a9c8b69} - - - {3db93853-68d0-4283-a892-42763712c46c} - - - {f33115c7-3743-41eb-be5b-63fafc938175} - - - {7ce489f5-c2ee-4aff-b45c-20a0be4ff7cd} - - - {8eb8e94f-68c8-4120-bc36-ca23191db499} - - - {a6b232c3-aba7-4534-94ba-9cd66d5b8b61} - - - {f101873e-401f-43c0-ac0a-394785a44dfa} - - - {ea3f95b4-10be-49ef-9ae0-c1e08da5a730} - - - {b7de5c12-630e-4b43-81ac-3cdf74f286a5} - - - {8f61be53-ba2f-4d17-97bc-cae6e4a04117} - - - - - Core - - - Core\addons - - - Core\addons - - - Core\addons - - - Core\addons - - - Core\addons - - - Core\addons - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core\gdbstub - - - Core - - - Core - - - Core - - - Windows - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core\utils - - - Core\utils\decrypt - - - Core\utils\decrypt - - - Core\utils\decrypt - - - Core\utils - - - Core\utils - - - Core\utils - - - Core - - - Windows - - - Windows - - - Windows - - - Windows - - - Windows - - - Windows - - - Windows - - - Windows\tools - - - Windows\filters - - - Windows\filters - - - Windows\filters - - - Windows\filters - - - Windows\filters - - - Windows - - - Windows - - - Windows - - - Windows - - - Windows - - - Windows\tools - - - Windows\tools - - - Windows - - - Windows - - - Windows\tools - - - Windows\tools - - - Windows\tools - - - Windows - - - Windows\tools - - - Windows - - - Windows - - - Windows\tools - - - Windows - - - Windows\tools - - - Windows\tools - - - Windows - - - Windows - - - Windows\tools - - - Windows - - - Windows\tools - - - - - Core - - - Core - - - Core - - - Windows\resources - - - Windows\resources - - - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core\gdbstub - - - Core - - - Core - - - Core - - - Windows - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core - - - Core\utils - - - Core\utils\decrypt - - - Core\utils\decrypt - - - Core\utils\decrypt - - - Core\utils - - - Core\utils - - - Core\utils - - - Core\utils - - - Core - - - Core - - - Windows - - - Windows - - - Windows - - - Windows - - - Windows - - - Windows - - - Windows - - - Windows - - - Windows\tools - - - Windows\filters - - - Windows - - - Windows - - - Windows - - - Windows - - - Windows - - - Windows\tools - - - Windows\tools - - - Windows - - - Windows\tools - - - Windows\tools - - - Windows\tools - - - Windows\tools - - - Windows - - - Windows\tools - - - Windows - - - Windows\tools - - - Windows\tools - - - Windows - - - Windows - - - Windows - - - Windows\tools - - - Windows - - - Windows\tools - - - Windows\userconfig - - - - - Windows\resources - - - \ No newline at end of file diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp index c32b955b9..e9bf7a924 100644 --- a/desmume/src/windows/main.cpp +++ b/desmume/src/windows/main.cpp @@ -3142,33 +3142,18 @@ LRESULT OpenFile() ofn.lStructSize = sizeof(ofn); ofn.hwndOwner = hwnd; - // To avoid #ifdef hell, we'll do a little trick, as lpstrFilter - // needs 0 terminated string, and standard string library, of course, - // can't help us with string creation: just put a '|' were a string end - // should be, and later transform prior assigning to the OPENFILENAME structure - strncpy (fileFilter, "NDS ROM file (*.nds)|*.nds|NDS/GBA ROM File (*.ds.gba)|*.ds.gba|",512); -#ifdef HAVE_LIBZZIP - strncpy (fileFilter, "All Usable Files (*.nds, *.ds.gba, *.zip, *.gz, *.7z, *.rar, *.bz2)|*.nds;*.ds.gba;*.zip;*.gz;*.7z;*.rar;*.bz2|",512); -#endif + ofn.lpstrFilter = + "All Usable Files (*.nds, *.ds.gba, *.zip, *.7z, *.rar, *.bz2)\0*.nds;*.ds.gba;*.zip;*.7z;*.rar;*.bz2\0" + "NDS ROM file (*.nds)\0*.nds\0" + "NDS/GBA ROM File (*.ds.gba)\0*.ds.gba\0" + "Zipped NDS ROM file (*.zip)\0*.zip\0" + "7Zipped NDS ROM file (*.7z)\0*.7z\0" + "RARed NDS ROM file (*.rar)\0*.rar\0" + "BZipped NDS ROM file (*.bz2)\0*.bz2\0" + "Any file (*.*)\0*.*\0" + "\0" + ; //gzip doesnt actually work right now -#ifdef HAVE_LIBZZIP - strncat (fileFilter, "Zipped NDS ROM file (*.zip)|*.zip|",512 - strlen(fileFilter)); -#endif -#ifdef HAVE_LIBZ - strncat (fileFilter, "GZipped NDS ROM file (*.gz)|*.gz|",512 - strlen(fileFilter)); -#endif - strncat (fileFilter, "7Zipped NDS ROM file (*.7z)|*.7z|",512 - strlen(fileFilter)); - strncat (fileFilter, "RARed NDS ROM file (*.rar)|*.rar|",512 - strlen(fileFilter)); - strncat (fileFilter, "BZipped NDS ROM file (*.bz2)|*.bz2|",512 - strlen(fileFilter)); - - strncat (fileFilter, "Any file (*.*)|*.*||",512 - strlen(fileFilter)); - - filterSize = strlen(fileFilter); - for (i = 0; i < filterSize; i++) - { - if (fileFilter[i] == '|') fileFilter[i] = '\0'; - } - ofn.lpstrFilter = fileFilter; ofn.nFilterIndex = 1; ofn.lpstrFile = filename; ofn.nMaxFile = MAX_PATH; @@ -3180,23 +3165,24 @@ LRESULT OpenFile() path.getpath(path.ROMS, buffer); ofn.lpstrInitialDir = buffer; - - if (GetOpenFileName(&ofn) == NULL) { + if (GetOpenFileName(&ofn) == NULL) + { NDS_UnPause(); return 0; } - else { - if(path.savelastromvisit) + else { - char *lchr, buffer[MAX_PATH]; - ZeroMemory(buffer, sizeof(buffer)); + if(path.savelastromvisit) + { + char *lchr, buffer[MAX_PATH]; + ZeroMemory(buffer, sizeof(buffer)); - lchr = strrchr(filename, '\\'); - strncpy(buffer, filename, strlen(filename) - strlen(lchr)); - - path.setpath(path.ROMS, buffer); - WritePathSettings(); - } + lchr = strrchr(filename, '\\'); + strncpy(buffer, filename, strlen(filename) - strlen(lchr)); + + path.setpath(path.ROMS, buffer); + WritePathSettings(); + } } if(!OpenCore(filename)) diff --git a/desmume/src/windows/zlib123/zlib-1.2.3_from_tastools b/desmume/src/windows/zlib123/zlib-1.2.3_from_tastools new file mode 100644 index 000000000..e69de29bb diff --git a/desmume/src/windows/zlib123/zlib-2005-x32.lib b/desmume/src/windows/zlib123/zlib-2005-x32.lib deleted file mode 100644 index 83e7a88ac..000000000 Binary files a/desmume/src/windows/zlib123/zlib-2005-x32.lib and /dev/null differ diff --git a/desmume/src/windows/zlib123/zlib-2005-x64.lib b/desmume/src/windows/zlib123/zlib-2005-x64.lib deleted file mode 100644 index 5d1f70fb6..000000000 Binary files a/desmume/src/windows/zlib123/zlib-2005-x64.lib and /dev/null differ diff --git a/desmume/src/windows/zlib123/zlib-2008-x32.lib b/desmume/src/windows/zlib123/zlib-2008-x32.lib deleted file mode 100644 index 796ea9461..000000000 Binary files a/desmume/src/windows/zlib123/zlib-2008-x32.lib and /dev/null differ diff --git a/desmume/src/windows/zlib123/zlib-2008-x64.lib b/desmume/src/windows/zlib123/zlib-2008-x64.lib deleted file mode 100644 index f6e0ae263..000000000 Binary files a/desmume/src/windows/zlib123/zlib-2008-x64.lib and /dev/null differ diff --git a/desmume/src/windows/zlib123/zlib-vc8-Win32.lib b/desmume/src/windows/zlib123/zlib-vc8-Win32.lib new file mode 100644 index 000000000..7ffef0a2b Binary files /dev/null and b/desmume/src/windows/zlib123/zlib-vc8-Win32.lib differ diff --git a/desmume/src/windows/zlib123/zlib-vc8-x64.lib b/desmume/src/windows/zlib123/zlib-vc8-x64.lib new file mode 100644 index 000000000..6fdf01cbe Binary files /dev/null and b/desmume/src/windows/zlib123/zlib-vc8-x64.lib differ diff --git a/desmume/src/windows/zziplib/README b/desmume/src/windows/zziplib/README deleted file mode 100644 index 5668eda04..000000000 --- a/desmume/src/windows/zziplib/README +++ /dev/null @@ -1,47 +0,0 @@ -PROJECT - The zziplib provides read access to zipped files in a zip-archive, - using compression based solely on free algorithms provided by zlib. - It also provides a functionality to overlay the archive filesystem - with the filesystem of the operating system environment. - -AUTHOR - The project was originally written by Tomi Ollila, later largely - rewritten by Guido Draheim, and extended with contributions in - the years to follow. Guido Draheim holds the full - copyright to the zziplib sources. - -COPYING - The zziplib may be used freely under the restrictions of the - GNU Lesser General Public License version 2 or later. Alternativly - the Mozilla Public license can be chosen. The sources are under - a dual license, as long as the MPL hint is not removed, the modified - files will be again under a dual license for the final recipient. - -LICENSING - If you can not use a dynalinked library according to LGPL rules, - then look at docs/copying.htm for a few hints. Generally the LGPL - has a way for staticlinking as well as the MPL has a way. Anyway, - special (paid) licenses can be negotiated with the copyright holder. - -HOMEPAGE - The zziplib project is hosted at SourceForge, the complete - documentation can be found at http://zziplib.sf.net - the - SourceForge servers are also used to distribute the sources - of the zziplib project. Releases are announced via the - freshmeat services on http://freshmeat.net/projects/zziplib - -INSTALLATION - The zziplib sources are built with gnu autotools and they should - be easy to install on unixish systems via the usual sequence of - `configure && make && make check && make install`. Many distributors - ship prebuilt packages e.g. in rpm format. Additionally there are - MSVC project files shipped along for usage with the Microsoft - VisualC series of compilers. There should be no problem either - when crosscompiling the zziplib for a third host platform. - -MAINTAINANCE - The zziplib library is intentionally a lightweight interface to - zip files. The author take patches but please consider to put - complex extensions into separate modules rather than implanting them - right into the core of the library engine. All Patches and Bug Reports - should be sent to Guido Draheim . diff --git a/desmume/src/windows/zziplib/zzip/_msvc.h b/desmume/src/windows/zziplib/zzip/_msvc.h deleted file mode 100644 index 81adb6a4a..000000000 --- a/desmume/src/windows/zziplib/zzip/_msvc.h +++ /dev/null @@ -1,213 +0,0 @@ -#ifndef _ZZIP__MSVC_H -#define _ZZIP__MSVC_H 1 - -#define _zzip_calltype __cdecl - -/* zzip/_msvc.h. Generated automatically at end of configure. */ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define to 1 if you have the header file. */ -/* #undef ZZIP_HAVE_BYTESWAP_H */ - -/* Define to 1 if you have the header file. */ -#ifndef ZZIP_HAVE_DIRECT_H -#define ZZIP_HAVE_DIRECT_H 1 -#endif - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -/* #undef ZZIP_HAVE_DIRENT_H */ - -/* Define to 1 if you have the header file. */ -/* #undef ZZIP_HAVE_DLFCN_H */ - -/* Define to 1 if you have the header file. */ -/* #undef ZZIP_HAVE_FNMATCH_H */ - -/* Define to 1 if you have the header file. */ -/* #undef ZZIP_HAVE_INTTYPES_H */ - -/* Define to 1 if you have the header file. */ -#ifndef ZZIP_HAVE_IO_H -#define ZZIP_HAVE_IO_H 1 -#endif - -/* Define to 1 if you have the header file. */ -#ifndef ZZIP_HAVE_MEMORY_H -#define ZZIP_HAVE_MEMORY_H 1 -#endif - -/* Define to 1 if you have the header file, and it defines `DIR'. */ -/* #undef ZZIP_HAVE_NDIR_H */ - -/* Define to 1 if you have the header file. */ -/* #undef ZZIP_HAVE_STDINT_H */ - -/* Define to 1 if you have the header file. */ -#ifndef ZZIP_HAVE_STDLIB_H -#define ZZIP_HAVE_STDLIB_H 1 -#endif - -/* Define to 1 if you have the `strcasecmp' function. */ -/* #undef ZZIP_HAVE_STRCASECMP */ - -/* Define to 1 if you have the header file. */ -/* #undef ZZIP_HAVE_STRINGS_H */ - -/* Define to 1 if you have the header file. */ -#ifndef ZZIP_HAVE_STRING_H -#define ZZIP_HAVE_STRING_H 1 -#endif - -/* Define to 1 if you have the `strndup' function. */ -/* #undef ZZIP_HAVE_STRNDUP */ - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -/* #undef ZZIP_HAVE_SYS_DIR_H */ - -/* Define to 1 if you have the header file. */ -/* #undef ZZIP_HAVE_SYS_INT_TYPES_H */ - -/* Define to 1 if you have the header file. */ -/* #undef ZZIP_HAVE_SYS_MMAN_H */ - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -/* #undef ZZIP_HAVE_SYS_NDIR_H */ - -/* Define to 1 if you have the header file. */ -/* #undef ZZIP_HAVE_SYS_PARAM_H */ - -/* Define to 1 if you have the header file. */ -#ifndef ZZIP_HAVE_SYS_STAT_H -#define ZZIP_HAVE_SYS_STAT_H 1 -#endif - -/* Define to 1 if you have the header file. */ -#ifndef ZZIP_HAVE_SYS_TYPES_H -#define ZZIP_HAVE_SYS_TYPES_H 1 -#endif - -/* Define to 1 if you have the header file. */ -/* #undef ZZIP_HAVE_UNISTD_H */ - -/* Define to 1 if you have the header file. */ -#ifndef ZZIP_HAVE_WINBASE_H -#define ZZIP_HAVE_WINBASE_H 1 /* hmm, is that win32 ? */ -#endif - -/* Define to 1 if you have the header file. */ -#ifndef ZZIP_HAVE_WINDOWS_H -#define ZZIP_HAVE_WINDOWS_H 1 /* yes, this is windows */ -#endif - -/* Define to 1 if you have the header file. */ -#ifndef ZZIP_HAVE_WINNT_H -#define ZZIP_HAVE_WINNT_H 1 /* is that always true? */ -#endif - -/* Define to 1 if you have the header file. */ -#ifndef ZZIP_HAVE_ZLIB_H -#define ZZIP_HAVE_ZLIB_H 1 /* you do have it, right? */ -#endif - -/* whether the system defaults to 32bit off_t but can do 64bit when requested - */ -/* #undef ZZIP_LARGEFILE_SENSITIVE */ - -/* Name of package */ -#ifndef ZZIP_PACKAGE -#define ZZIP_PACKAGE "zziplib-msvc" /* yes, make it known */ -#endif - -/* Define to the address where bug reports for this package should be sent. */ -/* #undef ZZIP_PACKAGE_BUGREPORT */ - -/* Define to the full name of this package. */ -/* #undef ZZIP_PACKAGE_NAME */ - -/* Define to the full name and version of this package. */ -/* #undef ZZIP_PACKAGE_STRING */ - -/* Define to the one symbol short name of this package. */ -/* #undef ZZIP_PACKAGE_TARNAME */ - -/* Define to the version of this package. */ -/* #undef ZZIP_PACKAGE_VERSION */ - -/* The number of bytes in type int */ -#ifndef ZZIP_SIZEOF_INT -#define ZZIP_SIZEOF_INT 4 -#endif - -/* The number of bytes in type long */ -#ifndef ZZIP_SIZEOF_LONG -#define ZZIP_SIZEOF_LONG 4 -#endif - -/* The number of bytes in type short */ -#ifndef ZZIP_SIZEOF_SHORT -#define ZZIP_SIZEOF_SHORT 2 -#endif - -/* Define to 1 if you have the ANSI C header files. */ -#ifndef ZZIP_STDC_HEADERS -#define ZZIP_STDC_HEADERS 1 -#endif - -/* Version number of package */ -#ifndef ZZIP_VERSION -#define ZZIP_VERSION "0.13.x" -#endif - -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ -/* #undef ZZIP_WORDS_BIGENDIAN */ - -/* Number of bits in a file offset, on hosts where this is settable. */ -/* #undef ZZIP__FILE_OFFSET_BITS */ - -/* Define for large files, on AIX-style hosts. */ -/* #undef ZZIP__LARGE_FILES */ - -/* Define to `long long' if does not define. */ -/* #undef ZZIP___int64 */ - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef _zzip_const */ - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -#ifndef _zzip_inline -#define _zzip_inline __inline -#endif -#endif - -/* Define to `_zzip_off_t' if does not define. */ -#ifndef _zzip_off64_t -#define _zzip_off64_t __int64 -#endif - -/* Define to `long' if does not define. */ -#ifndef _zzip_off_t -#define _zzip_off_t long -#endif - -/* Define to equivalent of C99 restrict keyword, or to nothing if this is not - supported. Do not define if restrict is supported directly. */ -#ifndef _zzip_restrict -#define _zzip_restrict -#endif - -/* Define to `unsigned' if does not define. */ -/* #undef _zzip_size_t */ - -/* Define to `int' if does not define. */ -#ifndef _zzip_ssize_t -#define _zzip_ssize_t int -#endif - -/* once: _ZZIP__MSVC_H */ -#endif diff --git a/desmume/src/windows/zziplib/zzip/conf.h b/desmume/src/windows/zziplib/zzip/conf.h deleted file mode 100644 index 640b0d9d0..000000000 --- a/desmume/src/windows/zziplib/zzip/conf.h +++ /dev/null @@ -1,540 +0,0 @@ -/* - - * Here we postprocess autoconf generated prefix-config.h entries. - - * This is generally for things like "off_t" which is left undefined - - * in plain config.h if the host system does already have it but we do - - * need the prefix variant - so we add here a #define _zzip_off_t off_t - - * - - * This file is supposed to only carry '#define's. - - * See for definitions that might be seen by the compiler. - - * - - * Author: - - * Guido Draheim - - * - - * Copyright (c) 2001,2002,2003,2004 Guido Draheim - - * All rights reserved, - - * use under the restrictions of the - - * Lesser GNU General Public License - - * or alternatively the restrictions - - * of the Mozilla Public License 1.1 - - */ - - - -#ifndef _ZZIP_CONF_H - -#define _ZZIP_CONF_H 1 - - - -#if !defined ZZIP_OMIT_CONFIG_H - -# if defined _MSC_VER || defined __BORLANDC__ || defined __WATCOMC__ - -# include - -# elif defined ZZIP_1_H - -# include "zzip-1.h" - -# elif defined ZZIP_2_H - -# include "zzip-2.h" - -# elif defined ZZIP_3_H - -# include "zzip-3.h" - -# elif defined ZZIP_4_H - -# include "zzip-4.h" - -# elif defined ZZIP_5_H - -# include "zzip-5.h" - -# else /* autoconf generated */ - -# include - -# endif - -#endif - - - -/* especially win32 platforms do not declare off_t so far - see zzip-msvc.h */ - -#ifndef _zzip_off_t - -#ifdef ZZIP_off_t - -#define _zzip_off_t ZZIP_off_t - -#else - -#define _zzip_off_t off_t - -#endif - -#endif - - - -#ifndef _zzip_off64_t - -#ifdef ZZIP_off64_t - -#define _zzip_off64_t ZZIP_off64_t - -#else - -#define _zzip_off64_t off64_t - -#endif - -#endif - - - -/* currently unused, all current zziplib-users do have ansi-C94 compilers. */ - -#ifndef _zzip_const - -#ifdef ZZIP_const - -#define _zzip_const ZZIP_const - -#else - -#define _zzip_const const - -#endif - -#endif - -#ifndef _zzip_inline - -#ifdef ZZIP_inline - -#define _zzip_inline ZZIP_inline - -#else - -#define _zzip_inline inline - -#endif - -#endif - -#ifndef _zzip_restrict - -#ifdef ZZIP_restrict - -#define _zzip_restrict ZZIP_restrict - -#else - -#define _zzip_restrict restrict - -#endif - -#endif - -#if defined __linux__ && __GNUC__+0 >= 4 - -#define zzip__new__ __attribute__((malloc)) - -#elif defined __linux__ && __GNUC__+0 >= 3 && __GNUC_MINOR_+0 >= 3 - -#define zzip__new__ __attribute__((malloc)) - -#else - -#define zzip__new__ - -#endif - - - -#ifndef _zzip_size_t - -#ifdef ZZIP_size_t - -#define _zzip_size_t ZZIP_size_t - -#else - -#define _zzip_size_t size_t - -#endif - -#endif - -#ifndef _zzip_ssize_t - -#ifdef ZZIP_ssize_t - -#define _zzip_ssize_t ZZIP_ssize_t - -#else - -#define _zzip_ssize_t ssize_t - -#endif - -#endif - -#ifndef _zzip___int64 - -#ifdef ZZIP___int64 - -#define _zzip___int64 ZZIP___int64 - -#else - -#define _zzip___int64 long long - -#endif - -#endif - - - -/* whether this library shall use a 64bit off_t largefile variant in 64on32: */ - -/* (some exported names must be renamed to avoid bad calls after linking) */ - -#if defined ZZIP_LARGEFILE_SENSITIVE - -# if _FILE_OFFSET_BITS+0 == 64 - -# define ZZIP_LARGEFILE_RENAME - -# elif defined _LARGE_FILES /* used on older AIX to get at 64bit off_t */ - -# define ZZIP_LARGEFILE_RENAME - -# elif defined _ZZIP_LARGEFILE /* or simply use this one for zzip64 runs */ - -# define ZZIP_LARGEFILE_RENAME - -# endif - -#endif - - - -/* if the environment did not setup these for 64bit off_t largefile... */ - -#ifdef ZZIP_LARGEFILE_RENAME - -# ifndef _FILE_OFFSET_BITS - -# ifdef ZZIP__FILE_OFFSET_BITS /* == 64 */ - -# define _FILE_OFFSET_BITS ZZIP__FILE_OFFSET_BITS - -# endif - -# endif - -# ifndef _LARGE_FILES - -# ifdef ZZIP__LARGE_FILES /* == 1 */ - -# define _LARGE_FILES ZZIP__LARGE_FILES - -# endif - -# endif - -# ifndef _LARGEFILE_SOURCE - -# ifdef ZZIP__LARGEFILE_SOURCE /* == 1 */ - -# define _LARGEFILE_SOURCE ZZIP__LARGEFILE_SOURCE - -# endif - -# endif - -#endif - - - -#include - - - -/* mingw32msvc errno : would be in winsock.h */ - -#ifndef EREMOTE - -#define EREMOTE ESPIPE - -#endif - - - -#ifndef ELOOP - -#if defined EILSEQ - -#define ELOOP EILSEQ - -#else - -#define ELOOP ENOEXEC - -#endif - -#endif - - - -#if defined __WATCOMC__ - -#undef _zzip_inline - -#define _zzip_inline static - -#endif - - - -#if defined _MSC_VER || defined __WATCOMC__ - -#include - -#endif - - - -#ifdef _MSC_VER - -# if !__STDC__ - -# ifndef _zzip_lseek - -# define _zzip_lseek _lseek - -# endif - -# ifndef _zzip_read - -# define _zzip_read _read - -# endif - -# ifndef _zzip_write - -# define _zzip_write _write - -# endif - -# if 0 - -# ifndef _zzip_stat - -# define _zzip_stat _stat - -# endif - -# endif - -# endif /* !__STDC__ */ - -#endif - - /*MSVC*/ - - - -#if defined _MSC_VER || defined __WATCOMC__ - -# ifndef strcasecmp - -# define strcasecmp _stricmp - -# endif - -#endif - - - -# ifndef _zzip_lseek - -# define _zzip_lseek lseek - -# endif - - - -# ifndef _zzip_read - -# define _zzip_read read - -# endif - - - -# ifndef _zzip_write - -# define _zzip_write write - -# endif - - - -# if 0 - -# ifndef _zzip_stat - -# define _zzip_stat stat - -# endif - -# endif - - - - - -#if defined __GNUC__ || defined __attribute__ - -#define __zzip_attribute__(X) __attribute__(X) - -#else - -#define __zzip_attribute__(X) - -#endif - - - -#if defined ZZIP_EXPORTS || defined ZZIPLIB_EXPORTS - -# undef ZZIP_DLL - -#define ZZIP_DLL 1 - -#endif - - - -/* based on zconf.h : */ - -/* compile with -DZZIP_DLL for Windows DLL support */ - -#if defined ZZIP_DLL - -# if defined _WINDOWS || defined WINDOWS || defined _WIN32 - -/*# include */ - -# endif - -# if !defined _zzip_export && defined _MSC_VER && (defined WIN32 || defined _WIN32) - -# define _zzip_export __declspec(dllexport) /*WINAPI*/ - -# endif - -# if !defined _zzip_export && defined __BORLANDC__ - -# if __BORLANDC__ >= 0x0500 && defined WIN32 - -# include - -# define _zzip_export __declspec(dllexport) /*WINAPI*/ - -# else - -# if defined _Windows && defined __DLL__ - -# define _zzip_export _export - -# endif - -# endif - -# endif - -# if !defined _zzip_export && defined __GNUC__ - -# if defined __declspec - -# define _zzip_export extern __declspec(dllexport) - -# else - -# define _zzip_export extern - -# endif - -# endif - -# if !defined _zzip_export && defined __BEOS__ - -# define _zzip_export extern __declspec(export) - -# endif - -# if !defined _zzip_export && defined __WATCOMC__ - -# define _zzip_export extern __declspec(dllexport) - -# define ZEXPORT __syscall - -# define ZEXTERN extern - -# endif - -#endif - - - -#if !defined _zzip_export - -# if defined __GNUC__ /* || !defined HAVE_LIBZZIP */ - -# define _zzip_export extern - -# elif defined __declspec || (defined _MSC_VER && defined ZZIP_DLL) - -# define _zzip_export extern __declspec(dllimport) - -# else - -# define _zzip_export extern - -# endif - -#endif - - - -#endif - - - - - diff --git a/desmume/src/windows/zziplib/zzip/types.h b/desmume/src/windows/zziplib/zzip/types.h deleted file mode 100644 index 6f9c6e6f9..000000000 --- a/desmume/src/windows/zziplib/zzip/types.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * unlike in we are allowed to make up typedefs here, - * while over there only #defines are allowed - * - * Author: - * Guido Draheim - * - * Copyright (c) 2003,2004 Guido Draheim - * All rights reserved, - * usage allowed under the restrictions of the - * Lesser GNU General Public License - * or alternatively the restrictions - * of the Mozilla Public License 1.1 - * - * This file is usually the first to define some real symbols. If you do - * see some errors here then it is most likely the includepath is wrong - * or some includeheader is missing / unreadable on your system. - * (a) we include local headers with a "zzip/" prefix just to be sure - * to not actually get the wrong one. Consider to add `-I..` somewhere - * and especially VC/IDE users (who make up their own workspace files) - * should include the root source directory of this project. - * (b) size_t and ssize_t are sometimes found be `configure` but they are - * not in the usual places (ANSI C = stddef.h; UNIX = sys/types.h), so - * be sure to look for them and add the respective header as an #include. - */ - -#ifndef _ZZIP_TYPES_H_ -#define _ZZIP_TYPES_H_ - -#include -#include -#include /* size_t and friends */ -#ifdef ZZIP_HAVE_SYS_TYPES_H -#include /* bsd (mac) has size_t here */ -#endif -/* msvc6 has neither ssize_t (we assume "int") nor off_t (assume "long") */ - -typedef unsigned char zzip_byte_t; // especially zlib decoding data - -typedef _zzip_off64_t zzip_off64_t; -typedef _zzip_off_t zzip_off_t; -typedef _zzip_size_t zzip_size_t; /* Some error here? */ -typedef _zzip_ssize_t zzip_ssize_t; /* See notes above! */ - -/* in */ -typedef struct zzip_disk64_trailer ZZIP_DISK64_TRAILER; -typedef struct zzip_disk_trailer ZZIP_DISK_TRAILER; -typedef struct zzip_file_trailer ZZIP_FILE_TRAILER; -typedef struct zzip_root_dirent ZZIP_ROOT_DIRENT; -typedef struct zzip_file_header ZZIP_FILE_HEADER; -typedef struct zzip_disk_entry ZZIP_DISK_ENTRY; -typedef struct zzip_extra_block ZZIP_EXTRA_BLOCK; - - - -#endif - diff --git a/desmume/src/windows/zziplib/zzip/zzip.h b/desmume/src/windows/zziplib/zzip/zzip.h deleted file mode 100644 index 80cfc0cec..000000000 --- a/desmume/src/windows/zziplib/zzip/zzip.h +++ /dev/null @@ -1,268 +0,0 @@ -/* - * Author: - * Guido Draheim - * Tomi Ollila - * - * Copyright (c) 1999,2000,2001,2002,2003,2004 Guido Draheim - * All rights reserved, - * usage allowed under the restrictions of the - * Lesser GNU General Public License - * or alternatively the restrictions - * of the Mozilla Public License 1.1 - * - * if you see "unknown symbol" errors, check first that `-I ..` is part of - * your compiler options - a special hint to VC/IDE users who tend to make up - * their own workspace files. All includes look like #include , so - * you need to add an include path to the dir containing (!!) the ./zzip/ dir - */ - -#ifndef _ZZIP_ZZIP_H /* zziplib.h */ -#define _ZZIP_ZZIP_H - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -/* the zzip_error_t is also used to pass back ZLIB errors... */ -#define ZZIP_ERROR -4096 - -typedef enum -{ - ZZIP_NO_ERROR = 0, /* no error, may be used if user sets it. */ - ZZIP_OUTOFMEM = ZZIP_ERROR-20, /* out of memory */ - ZZIP_DIR_OPEN = ZZIP_ERROR-21, /* failed to open zipfile, see errno for details */ - ZZIP_DIR_STAT = ZZIP_ERROR-22, /* failed to fstat zipfile, see errno for details */ - ZZIP_DIR_SEEK = ZZIP_ERROR-23, /* failed to lseek zipfile, see errno for details */ - ZZIP_DIR_READ = ZZIP_ERROR-24, /* failed to read zipfile, see errno for details */ - ZZIP_DIR_TOO_SHORT = ZZIP_ERROR-25, - ZZIP_DIR_EDH_MISSING = ZZIP_ERROR-26, - ZZIP_DIRSIZE = ZZIP_ERROR-27, - ZZIP_ENOENT = ZZIP_ERROR-28, - ZZIP_UNSUPP_COMPR = ZZIP_ERROR-29, - ZZIP_CORRUPTED = ZZIP_ERROR-31, - ZZIP_UNDEF = ZZIP_ERROR-32, - ZZIP_DIR_LARGEFILE = ZZIP_ERROR-33 -} zzip_error_t; - -/* - * zzip_open flags. - */ -#define ZZIP_CASEINSENSITIVE O_APPEND /* do not use anymore. use CASLESS */ -#define ZZIP_IGNOREPATH O_TRUNC /* do not use anymore. use NOPATHS */ -#define ZZIP_EXTRAFLAGS (ZZIP_CASEINSENSITIVE|ZZIP_IGNOREPATH) - -/* zzip_open_ext_io o_modes flags : new style. use these from now on! */ -#define ZZIP_CASELESS (1<<12) /* ignore filename case inside zips */ -#define ZZIP_NOPATHS (1<<13) /* ignore subdir paths, just filename*/ -#define ZZIP_PREFERZIP (1<<14) /* try first zipped file, then real*/ -#define ZZIP_ONLYZIP (1<<16) /* try _only_ zipped file, skip real*/ -#define ZZIP_FACTORY (1<<17) /* old file handle is not closed */ -#define ZZIP_ALLOWREAL (1<<18) /* real files use default_io (magic) */ -#define ZZIP_THREADED (1<<19) /* try to be safe for multithreading */ - -/* - * zzip largefile renames - */ -#ifdef ZZIP_LARGEFILE_RENAME -#define zzip_telldir zzip_telldir64 -#define zzip_seekdir zzip_seekdir64 -#endif - -/* - * zzip typedefs - */ -/* zzip_strings_t ext[] = { ".zip", ".jar", ".pk3", 0 } */ -typedef char _zzip_const * _zzip_const zzip_strings_t; -typedef char _zzip_const zzip_char_t; -typedef struct zzip_dir ZZIP_DIR; -typedef struct zzip_file ZZIP_FILE; -typedef struct zzip_dirent ZZIP_DIRENT; -typedef struct zzip_dirent ZZIP_STAT; - -struct zzip_dirent -{ - int d_compr; /* compression method */ - int d_csize; /* compressed size */ - int st_size; /* file size / decompressed size */ - char * d_name; /* file name / strdupped name */ -}; - -/* - * Getting error strings - * zzip/err.c - */ -_zzip_export /* error in _opendir : */ -zzip_char_t* _zzip_calltype zzip_strerror(int errcode); -_zzip_export /* error in other functions : */ -zzip_char_t* _zzip_calltype zzip_strerror_of(ZZIP_DIR * dir); -_zzip_export /* error mapped to errno.h defines : */ -int zzip_errno(int errcode); - - -/* - * Functions to grab information from ZZIP_DIR/ZZIP_FILE structure - * (if ever needed) - * zzip/info.c - */ -_zzip_export -int _zzip_calltype zzip_error(ZZIP_DIR * dir); -_zzip_export -void _zzip_calltype zzip_seterror(ZZIP_DIR * dir, int errcode); -_zzip_export -zzip_char_t* zzip_compr_str(int compr); - -_zzip_export -ZZIP_DIR * _zzip_calltype zzip_dirhandle(ZZIP_FILE * fp); -_zzip_export -int _zzip_calltype zzip_dirfd(ZZIP_DIR * dir); -_zzip_export -int _zzip_calltype zzip_dir_real(ZZIP_DIR * dir); -_zzip_export -int _zzip_calltype zzip_file_real(ZZIP_FILE * fp); -_zzip_export -void* _zzip_calltype zzip_realdir(ZZIP_DIR * dir); -_zzip_export -int _zzip_calltype zzip_realfd(ZZIP_FILE * fp); - -/* - * zip handle management - * zzip/zip.c - */ -_zzip_export -ZZIP_DIR * _zzip_calltype zzip_dir_alloc(zzip_strings_t* fileext); -_zzip_export -int _zzip_calltype zzip_dir_free(ZZIP_DIR *); - -/* - * Opening/closing a zip archive - * zzip-zip.c - */ -_zzip_export -ZZIP_DIR * _zzip_calltype zzip_dir_fdopen(int fd, zzip_error_t * errcode_p); -_zzip_export -ZZIP_DIR * _zzip_calltype zzip_dir_open(zzip_char_t* filename, zzip_error_t * errcode_p); -_zzip_export -int _zzip_calltype zzip_dir_close(ZZIP_DIR * dir); -_zzip_export -int _zzip_calltype zzip_dir_read(ZZIP_DIR * dir, ZZIP_DIRENT * dirent); - - -/* - * Scanning files in zip archive - * zzip/dir.c - * zzip/zip.c - */ -_zzip_export -ZZIP_DIR * _zzip_calltype zzip_opendir(zzip_char_t* filename); -_zzip_export -int _zzip_calltype zzip_closedir(ZZIP_DIR * dir); -_zzip_export -ZZIP_DIRENT * _zzip_calltype zzip_readdir(ZZIP_DIR * dir); -_zzip_export -void _zzip_calltype zzip_rewinddir(ZZIP_DIR * dir); -_zzip_export -zzip_off_t _zzip_calltype zzip_telldir(ZZIP_DIR * dir); -_zzip_export -void _zzip_calltype zzip_seekdir(ZZIP_DIR * dir, zzip_off_t offset); - -/* - * 'opening', 'closing' and reading invidual files in zip archive. - * zzip/file.c - */ -_zzip_export -ZZIP_FILE * _zzip_calltype zzip_file_open(ZZIP_DIR * dir, zzip_char_t* name, int flags); -_zzip_export -int _zzip_calltype zzip_file_close(ZZIP_FILE * fp); -_zzip_export -zzip_ssize_t _zzip_calltype zzip_file_read(ZZIP_FILE * fp, void* buf, zzip_size_t len); - -_zzip_export -ZZIP_FILE * _zzip_calltype zzip_open(zzip_char_t* name, int flags); -_zzip_export -int _zzip_calltype zzip_close(ZZIP_FILE * fp); -_zzip_export -zzip_ssize_t _zzip_calltype zzip_read(ZZIP_FILE * fp, void * buf, zzip_size_t len); - -/* - * the stdc variant to open/read/close files. - Take note of the freopen() - * call as it may reuse an existing preparsed copy of a zip central directory - */ -_zzip_export -ZZIP_FILE* _zzip_calltype zzip_freopen(zzip_char_t* name, zzip_char_t* mode, ZZIP_FILE*); -_zzip_export -ZZIP_FILE* _zzip_calltype zzip_fopen(zzip_char_t* name, zzip_char_t* mode); -_zzip_export -zzip_size_t _zzip_calltype zzip_fread(void *ptr, zzip_size_t size, zzip_size_t nmemb, - ZZIP_FILE * file); -_zzip_export -int zzip_fclose(ZZIP_FILE * fp); - -/* - * seek and tell functions - */ -_zzip_export -int _zzip_calltype zzip_rewind(ZZIP_FILE *fp); -_zzip_export -zzip_off_t _zzip_calltype zzip_seek(ZZIP_FILE * fp, zzip_off_t offset, int whence); -_zzip_export -zzip_off_t _zzip_calltype zzip_tell(ZZIP_FILE * fp); - -/* - * reading info of a single file - * zzip/stat.c - */ -_zzip_export -int _zzip_calltype zzip_dir_stat(ZZIP_DIR * dir, zzip_char_t* name, - ZZIP_STAT * zs, int flags); -_zzip_export -int _zzip_calltype zzip_file_stat(ZZIP_FILE * fp, ZZIP_STAT * zs); -_zzip_export -int _zzip_calltype zzip_fstat(ZZIP_FILE * fp, ZZIP_STAT * zs); - -#ifdef ZZIP_LARGEFILE_RENAME -#define zzip_open_shared_io zzip_open_shared_io64 -#define zzip_open_ext_io zzip_open_ext_io64 -#define zzip_opendir_ext_io zzip_opendir_ext_io64 -#define zzip_dir_open_ext_io zzip_dir_open_ext_io64 -#define zzip_plugin_io_t zzip_plugin_io64_t -#endif - -/* - * all ext_io functions can be called with a default of ext/io == zero/zero - * which will default to a ".zip" extension and posix io of the system. - */ -typedef union _zzip_plugin_io _zzip_const * zzip_plugin_io_t; - -_zzip_export -ZZIP_FILE * _zzip_calltype zzip_open_shared_io(ZZIP_FILE* stream, - zzip_char_t* name, int o_flags, int o_modes, - zzip_strings_t* ext, zzip_plugin_io_t io); - -_zzip_export -ZZIP_FILE * _zzip_calltype zzip_open_ext_io(zzip_char_t* name, int o_flags, int o_modes, - zzip_strings_t* ext, zzip_plugin_io_t io); - -_zzip_export -ZZIP_DIR * _zzip_calltype zzip_opendir_ext_io(zzip_char_t* name, int o_modes, - zzip_strings_t* ext, zzip_plugin_io_t io); - -_zzip_export -ZZIP_DIR * _zzip_calltype zzip_dir_open_ext_io(zzip_char_t* filename, - zzip_error_t* errcode_p, - zzip_strings_t* ext, zzip_plugin_io_t io); - -/* zzip_file_open_ext_io => zzip_dir_open_ext_io + zzip_file_open */ - -#ifdef __cplusplus -}; -#endif - -#endif /* _ZZIPLIB_H */ - -/* - * Local variables: - * c-file-style: "stroustrup" - * End: - */ diff --git a/desmume/src/windows/zziplib/zziplib-2005-x32.lib b/desmume/src/windows/zziplib/zziplib-2005-x32.lib deleted file mode 100644 index 55d973d3d..000000000 Binary files a/desmume/src/windows/zziplib/zziplib-2005-x32.lib and /dev/null differ diff --git a/desmume/src/windows/zziplib/zziplib-2005-x64.lib b/desmume/src/windows/zziplib/zziplib-2005-x64.lib deleted file mode 100644 index 56943ef9d..000000000 Binary files a/desmume/src/windows/zziplib/zziplib-2005-x64.lib and /dev/null differ diff --git a/desmume/src/windows/zziplib/zziplib-2008-x32.lib b/desmume/src/windows/zziplib/zziplib-2008-x32.lib deleted file mode 100644 index 7750ed6f7..000000000 Binary files a/desmume/src/windows/zziplib/zziplib-2008-x32.lib and /dev/null differ diff --git a/desmume/src/windows/zziplib/zziplib-2008-x64.lib b/desmume/src/windows/zziplib/zziplib-2008-x64.lib deleted file mode 100644 index 46b197008..000000000 Binary files a/desmume/src/windows/zziplib/zziplib-2008-x64.lib and /dev/null differ