mirror of
https://github.com/isledecomp/isle-portable.git
synced 2026-01-11 18:41:14 +00: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
31 lines
844 B
CMake
31 lines
844 B
CMake
project(wine_d3drm LANGUAGES C)
|
|
|
|
set(CMAKE_C_CLANG_TIDY)
|
|
|
|
add_library(d3drm-wine SHARED EXCLUDE_FROM_ALL
|
|
d3drm.c
|
|
d3drm_main.c
|
|
d3drm_private.h
|
|
d3drm.spec
|
|
device.c
|
|
face.c
|
|
frame.c
|
|
light.c
|
|
material.c
|
|
math.c
|
|
meshbuilder.c
|
|
texture.c
|
|
version.rc
|
|
viewport.c
|
|
|
|
d3drm.def
|
|
)
|
|
target_include_directories(d3drm-wine SYSTEM INTERFACE "${CMAKE_CURRENT_LIST_DIR}/include")
|
|
target_link_libraries(d3drm-wine PRIVATE d3dxof ddraw)
|
|
set_property(TARGET d3drm-wine PROPERTY PREFIX "")
|
|
set_property(TARGET d3drm-wine PROPERTY OUTPUT_NAME "d3drm")
|
|
target_compile_definitions(d3drm-wine PRIVATE "__WINESRC__")
|
|
target_compile_definitions(d3drm-wine PRIVATE "WINE_NO_TRACE_MSGS")
|
|
target_compile_definitions(d3drm-wine PRIVATE "WINE_NO_DEBUG_MSGS")
|
|
target_compile_definitions(d3drm-wine PRIVATE "DECLSPEC_EXPORT=")
|