Egalware/lib3mf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib3MF :

Browse Source 
- ricompilazione a 64bit con Enable Enhanced Instruction Set = Not Set
- piccola modifica per limitare controllo compilazione prototipi puntatori a funzione.
This commit is contained in:
Dario Sassi
2023-09-21 15:19:31 +02:00
parent 522c48f27e
commit 4d19f13a60
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Lib3MF.vcxproj
+4 -4
View File
@@ -100,7 +100,7 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>__LIB3MF_EXPORTS ; NOMINMAX ; WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>false</ConformanceMode>
<AdditionalIncludeDirectories>/Lib3MF/Include ; /Lib3MF/Include/API ; /Lib3MF/Include/Libraries/zlib ; /Lib3MF/Include/Libraries/libzip</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>/EgtDev/Lib3MF/Include;/EgtDev/Lib3MF/Include/API;/EgtDev/Lib3MF/Include/Libraries/zlib;/EgtDev/Lib3MF/Include/Libraries/libzip</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
</ClCompile>
<Link>
@@ -124,7 +124,7 @@ copy $(TargetPath) \EgtProg\DllD32</Command>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>__LIB3MF_EXPORTS; NOMINMAX ; WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>false</ConformanceMode>
<AdditionalIncludeDirectories>/Lib3MF/Include ; /Lib3MF/Include/API ; /Lib3MF/Include/Libraries/zlib ; /Lib3MF/Include/Libraries/libzip</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>/EgtDev/Lib3MF/Include;/EgtDev/Lib3MF/Include/API;/EgtDev/Lib3MF/Include/Libraries/zlib;/EgtDev/Lib3MF/Include/Libraries/libzip</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
</ClCompile>
<Link>
@@ -147,7 +147,7 @@ copy $(TargetPath) \EgtProg\Dll32</Command>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>__LIB3MF_EXPORTS; NOMINMAX; _DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>/Lib3MF/Include ; /Lib3MF/Include/API ; /Lib3MF/Include/Libraries/zlib ; /Lib3MF/Include/Libraries/libzip</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>/EgtDev/Lib3MF/Include;/EgtDev/Lib3MF/Include/API;/EgtDev/Lib3MF/Include/Libraries/zlib;/EgtDev/Lib3MF/Include/Libraries/libzip</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
</ClCompile>
<Link>
@@ -171,7 +171,7 @@ copy $(TargetPath) \EgtProg\DllD64</Command>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>__LIB3MF_EXPORTS; NOMINMAX; NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>/Lib3MF/Include ; /Lib3MF/Include/API ; /Lib3MF/Include/Libraries/zlib ; /Lib3MF/Include/Libraries/libzip</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>/EgtDev/Lib3MF/Include;/EgtDev/Lib3MF/Include/API;/EgtDev/Lib3MF/Include/Libraries/zlib;/EgtDev/Lib3MF/Include/Libraries/libzip</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<TreatWarningAsError>false</TreatWarningAsError>
</ClCompile>
Source/Libraries/libzip/Win/zip_source_file_win32_utf16.c
+6
View File
@@ -39,6 +39,9 @@ static void utf16_make_tempname(char *buf, size_t len, const char *name, zip_uin
static char *utf16_strdup(const char *string);
/* clang-format off */
#ifdef __clang__
_Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored \"-Wincompatible-function-pointer-types\"")
#endif
zip_win32_file_operations_t ops_utf16 = {
utf16_allocate_tempname,
@@ -52,6 +55,9 @@ zip_win32_file_operations_t ops_utf16 = {
utf16_strdup
};
#ifdef __clang__
_Pragma("GCC diagnostic pop")
#endif
/* clang-format on */
ZIP_EXTERN zip_source_t *