mirror of
https://github.com/isledecomp/isle-portable.git
synced 2024-12-22 05:42:29 -05:00
ec19d5edb0
* Fix engineConfig declaration crossing jump
This fixes the following error:
```
/src/isle-portable/LEGO1/omni/src/audio/mxsoundmanager.cpp: In member function 'virtual MxResult MxSoundManager::Create(MxU32, MxBool)':
/src/isle-portable/LEGO1/omni/src/audio/mxsoundmanager.cpp:119:1: error: jump to label 'done'
119 | done:
| ^~~~
/src/isle-portable/LEGO1/omni/src/audio/mxsoundmanager.cpp:78:22: note: from here
78 | goto done;
| ^~~~
/src/isle-portable/LEGO1/omni/src/audio/mxsoundmanager.cpp:84:26: note: crosses initialization of 'ma_engine_config engineConfig'
84 | ma_engine_config engineConfig = ma_engine_config_init();
| ^~~~~~~~~~~~
```
* Fix 'invalid conversion from 'SDL_FunctionPointer' {aka 'void (*)()'} to 'void*'
* /SAFESEH:NO is a VC thing
* SDL3 is still instable
* Cannot forward declare and use enum
* Remove MusicManager from public LEGO1.DLL interface
* Copy d3d from wine git 6c5d17af07a318d754c0c21023b2d162a0d3725d
* Build d3drm-wine with 32-bit mingw
* cmake: move 3rd party targets to cmake script in 3rdparty directory
* cmake: bump minimum required CMake version to 3.25 to allow adding a subproject with SYSTEM automatically applied
An alternative would be to use SYSTEM in target_include_directories in the 3rd party cmake script.
* Add a minimal Findiniparser.cmake (not all distributions carry the upstream iniparser-config.cmake files)
* Add wine's d3drm headers
* cmake: merge ISLE_USE_DX5_LIBS into ISLE_USE_DX5
* cmake: Build all shared libraries in the binary output directory (to avoid PATH issues)
* ci: enable msys2 mingw32 build
* Disable clang-tidy on d3drm wine
* Thread functions must have SDLCALL call convention
* cmake: disable clang-tidy for miniaudio and libsmacker as well
* Hopefully fix c++ format and skip ncc naming violation
* clang-format violations keep up popping out of nowhere
* No need for lego/legoomni/include
* ncc: define SDLCALL as empty instead
152 lines
4 KiB
Text
152 lines
4 KiB
Text
/*
|
|
* Copyright 2001 Dmitry Timoshkov
|
|
* Copyright 2004 Ivan Leo Puoti
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library 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
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
|
*/
|
|
|
|
#if 0
|
|
#pragma makedep header
|
|
#endif
|
|
|
|
#include "winresrc.h"
|
|
|
|
/*
|
|
Assign WINE_FILEVERSION and WINE_FILEVERSION_STR high enough number
|
|
to make sure that programs, relying on the version numbers, will
|
|
never complain.
|
|
*/
|
|
|
|
#ifndef WINE_FILEVERSION_MAJOR
|
|
#define WINE_FILEVERSION_MAJOR 10
|
|
#endif
|
|
|
|
#ifndef WINE_FILEVERSION_MINOR
|
|
#define WINE_FILEVERSION_MINOR 0
|
|
#endif
|
|
|
|
#ifndef WINE_FILEVERSION_BUILD
|
|
#define WINE_FILEVERSION_BUILD 0
|
|
#endif
|
|
|
|
#ifndef WINE_FILEVERSION_PLATFORMID
|
|
#define WINE_FILEVERSION_PLATFORMID 0
|
|
#endif
|
|
|
|
#ifndef WINE_FILEVERSION
|
|
#define WINE_FILEVERSION WINE_FILEVERSION_MAJOR,WINE_FILEVERSION_MINOR,\
|
|
WINE_FILEVERSION_BUILD,WINE_FILEVERSION_PLATFORMID
|
|
#endif
|
|
|
|
#define WINE_VER_STRINGIZE2(x) #x
|
|
#define WINE_VER_STRINGIZE(x) WINE_VER_STRINGIZE2(x)
|
|
#define WINE_VER_HEXPREFIX2(x) 0x ## x
|
|
#define WINE_VER_HEXPREFIX(x) WINE_VER_HEXPREFIX2(x)
|
|
|
|
#ifndef WINE_FILEVERSION_STR
|
|
#define WINE_FILEVERSION_STR WINE_VER_STRINGIZE(WINE_FILEVERSION_MAJOR.WINE_FILEVERSION_MINOR.WINE_FILEVERSION_BUILD.WINE_FILEVERSION_PLATFORMID)
|
|
#endif
|
|
|
|
#ifndef WINE_FILEDESCRIPTION_STR
|
|
#define WINE_FILEDESCRIPTION_STR "Wine core dll"
|
|
#endif
|
|
|
|
#ifndef WINE_FILENAME
|
|
#define WINE_FILENAME ""
|
|
#endif
|
|
|
|
#ifndef WINE_FILENAME_STR
|
|
#define WINE_FILENAME_STR ""
|
|
#endif
|
|
|
|
#ifndef WINE_FILETYPE
|
|
#define WINE_FILETYPE VFT_DLL
|
|
#endif
|
|
|
|
#ifndef WINE_FILESUBTYPE
|
|
#define WINE_FILESUBTYPE VFT2_UNKNOWN
|
|
#endif
|
|
|
|
#ifndef WINE_LEGALCOPYRIGHT
|
|
#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2024 the Wine project authors (see the file AUTHORS for a complete list)"
|
|
#endif
|
|
|
|
#ifndef WINE_PRODUCTVERSION
|
|
#define WINE_PRODUCTVERSION 1,0,0,0
|
|
#endif
|
|
|
|
#ifndef WINE_PRODUCTVERSION_STR
|
|
#define WINE_PRODUCTVERSION_STR "1.0"
|
|
#endif
|
|
|
|
#ifndef WINE_PRODUCTNAME_STR
|
|
#define WINE_PRODUCTNAME_STR "Wine"
|
|
#endif
|
|
|
|
#ifndef WINE_EXTRAVALUES
|
|
#define WINE_EXTRAVALUES
|
|
#endif
|
|
|
|
#ifndef WINE_CODEPAGE
|
|
#ifdef _WIN32
|
|
#define WINE_CODEPAGE 04B0 /* CP1200 (Unicode) */
|
|
#else
|
|
#define WINE_CODEPAGE 04E4 /* CP1252 for Win16 */
|
|
#endif
|
|
#endif
|
|
|
|
#ifndef WINE_CODEPAGE_STR
|
|
#define WINE_CODEPAGE_STR WINE_VER_STRINGIZE(WINE_CODEPAGE)
|
|
#endif
|
|
|
|
#ifndef WINE_CODEPAGE_HEX
|
|
#define WINE_CODEPAGE_HEX WINE_VER_HEXPREFIX(WINE_CODEPAGE)
|
|
#endif
|
|
|
|
#ifndef WINE_LANGID
|
|
#define WINE_LANGID 0409 /* LANG_ENGLISH/SUBLANG_DEFAULT */
|
|
#endif
|
|
#define WINE_LANGID_STR WINE_VER_STRINGIZE(WINE_LANGID)
|
|
#define WINE_LANGID_HEX WINE_VER_HEXPREFIX(WINE_LANGID)
|
|
|
|
VS_VERSION_INFO VERSIONINFO
|
|
FILEVERSION WINE_FILEVERSION
|
|
PRODUCTVERSION WINE_PRODUCTVERSION
|
|
FILEFLAGSMASK 63
|
|
FILEFLAGS 0
|
|
FILEOS VOS_UNKNOWN
|
|
FILETYPE WINE_FILETYPE
|
|
FILESUBTYPE WINE_FILESUBTYPE
|
|
{
|
|
BLOCK "StringFileInfo"
|
|
{
|
|
BLOCK WINE_LANGID_STR WINE_CODEPAGE_STR
|
|
{
|
|
VALUE "CompanyName", "Microsoft Corporation" /* GameGuard depends on this */
|
|
VALUE "FileDescription", WINE_FILEDESCRIPTION_STR
|
|
VALUE "FileVersion", WINE_FILEVERSION_STR
|
|
VALUE "InternalName", WINE_FILENAME
|
|
VALUE "LegalCopyright", WINE_LEGALCOPYRIGHT
|
|
VALUE "OriginalFilename", WINE_FILENAME_STR
|
|
VALUE "ProductName", WINE_PRODUCTNAME_STR
|
|
VALUE "ProductVersion", WINE_PRODUCTVERSION_STR
|
|
WINE_EXTRAVALUES
|
|
}
|
|
}
|
|
BLOCK "VarFileInfo"
|
|
{
|
|
VALUE "Translation", WINE_LANGID_HEX, WINE_CODEPAGE_HEX
|
|
}
|
|
}
|