From 904413b7eaf1d1ee5f45005723362226ef4efd75 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Thu, 25 Jan 2024 00:38:56 +0100 Subject: [PATCH] Return of the .def's --- CMakeLists.txt | 18 ++-- LEGO1/LEGO1.mingw.def | 168 +++++++++++++++++++++++++++++ LEGO1/LEGO1.msvc.def | 132 +++++++++++++++++++++++ LEGO1/omni/src/system/mxthread.cpp | 1 - 4 files changed, 311 insertions(+), 8 deletions(-) create mode 100644 LEGO1/LEGO1.mingw.def create mode 100644 LEGO1/LEGO1.msvc.def diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c669d26..a34084cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -203,13 +203,8 @@ add_library(omni STATIC LEGO1/omni/src/video/mxvideopresenter.cpp ) register_lego1_target(omni) -set_property(TARGET omni PROPERTY ARCHIVE_OUTPUT_NAME "omni<$:d>") -target_include_directories(omni PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include" "${CMAKE_SOURCE_DIR}/util") -#target_include_directories(omni PUBLIC "${CMAKE_SOURCE_DIR}/util") -target_include_directories(omni PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1") -#target_include_directories(omni PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1/omni/include") -#target_include_directories(omni PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1/lego/sources") -#target_include_directories(omni PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni/include") +set_property(TARGET omni PROPERTY ARCHIVE_OUTPUT_NAME "omni$<$:d>") +target_include_directories(omni PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include" "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/util") target_link_libraries(omni PRIVATE dsound winmm FLIC::FLIC Smacker::Smacker) add_library(lego1 SHARED @@ -346,6 +341,12 @@ if (MINGW) target_compile_definitions(lego1 PRIVATE DIRECTINPUT_VERSION=0x0500) endif() +if (MSVC) + target_sources(lego1 PRIVATE LEGO1/LEGO1.msvc.def) +else() + target_sources(lego1 PRIVATE LEGO1/LEGO1.mingw.def) +endif() + target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/util") target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1") target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1/omni/include") @@ -430,6 +431,9 @@ if (MSVC_FOR_DECOMP) endif() target_compile_options(lego1 PRIVATE "/MT$<$:d>") + foreach(tgt IN LISTS lego1_targets) + target_compile_options(${tgt} PRIVATE "/MT$<$:d>") + endforeach() set(CMAKE_CXX_FLAGS "/W3 /GX /D \"WIN32\" /D \"_WINDOWS\"") set(CMAKE_CXX_FLAGS_DEBUG "/Gm /Zi /Od /D \"_DEBUG\"") diff --git a/LEGO1/LEGO1.mingw.def b/LEGO1/LEGO1.mingw.def new file mode 100644 index 00000000..3181724b --- /dev/null +++ b/LEGO1/LEGO1.mingw.def @@ -0,0 +1,168 @@ +LIBRARY "LEGO1.DLL" +EXPORTS + _ZN19LegoBackgroundColorC1EPKcS1_@8 = _ZN19LegoBackgroundColorC1EPKcS1_ + _ZN19LegoBackgroundColorC2EPKcS1_@8 = _ZN19LegoBackgroundColorC2EPKcS1_ + _ZN13LegoGameState11SetSavePathEPc@4 = _ZN13LegoGameState11SetSavePathEPc + _ZN13LegoGameState20SerializePlayersInfoEs@4 = _ZN13LegoGameState20SerializePlayersInfoEs + _ZN13LegoGameState21SerializeScoreHistoryEs@4 = _ZN13LegoGameState21SerializeScoreHistoryEs + _ZN13LegoGameState4LoadEj@4 = _ZN13LegoGameState4LoadEj + _ZN13LegoGameState4SaveEj@4 = _ZN13LegoGameState4SaveEj + _ZN13LegoGameStateC1Ev + _ZN13LegoGameStateC2Ev + _ZN13LegoGameStateD1Ev + _ZN13LegoGameStateD2Ev + _ZN9LegoWorldC1Ev + _ZN9LegoWorldC2Ev + _ZN9LegoWorldD0Ev + _ZN9LegoWorldD1Ev + _ZN9LegoWorldD2Ev + DllMain@12 + _Z10PickEntityii + _Z12EventManagerv + _Z12InputManagerv + _Z12MusicManagerv + _Z12SoundManagerv + _Z12VideoManagerv + _Z13MSoundManagerv + _Z13TickleManagerv + _Z13VariableTablev + _Z14MakeSourceNamePcPKc + _Z17TransitionManagerv + _Z18CreateStreamObjectP8MxDSFiles + _Z18GetNoCD_SourceNamev + _Z18SetOmniUserMessagePFvPKciE + _Z19NotificationManagerv + _Z22BackgroundAudioManagerv + _Z4Legov + _Z5StartP10MxDSAction + _Z5Timerv + _Z7PickROIii + _Z8Streamerv + _Z9GameStatev + _ZN10LegoEntityD0Ev + _ZN10LegoEntityD1Ev + _ZN10LegoEntityD2Ev + _ZN10MxDSActionC1Ev + _ZN10MxDSActionC2Ev + _ZN10MxDSActionD0Ev + _ZN10MxDSActionD1Ev + _ZN10MxDSActionD2Ev + _ZN10MxDSObject13SetObjectNameEPKc@4 = _ZN10MxDSObject13SetObjectNameEPKc + _ZN10MxStreamer4OpenEPKct@8 = _ZN10MxStreamer4OpenEPKct + _ZN10MxStreamer5CloseEPKc@4 = _ZN10MxStreamer5CloseEPKc + _ZN11MxPresenter10DoneTickleEv + _ZN11MxPresenter10ParseExtraEv + _ZN11MxPresenter11StartActionEP18MxStreamControllerP10MxDSAction@8 = _ZN11MxPresenter11StartActionEP18MxStreamControllerP10MxDSAction + _ZN11MxPresenter4InitEv + _ZN11MxPresenter6EnableEh@4 = _ZN11MxPresenter6EnableEh + _ZN11MxPresenter6TickleEv + _ZN11MxPresenter9EndActionEv + _ZN11MxPresenterD0Ev + _ZN11MxPresenterD1Ev + _ZN11MxPresenterD2Ev + _ZN11MxScheduler11GetInstanceEv + _ZN11MxScheduler17StartMultiTaskingEj@4 = _ZN11MxScheduler17StartMultiTaskingEj + _ZN11ViewManager9RemoveAllEP7ViewROI@4 = _ZN11ViewManager9RemoveAllEP7ViewROI + _ZN12MxDirectDraw16FlipToGDISurfaceEv + _ZN12MxDirectDraw18GetPrimaryBitDepthEv + _ZN12MxDirectDraw5PauseEi@4 = _ZN12MxDirectDraw5PauseEi + _ZN12MxVideoParam13SetDeviceNameEPc@4 = _ZN12MxVideoParam13SetDeviceNameEPc + _ZN12MxVideoParamC1ERK8MxRect32P9MxPalettejRK17MxVideoParamFlags@16 = _ZN12MxVideoParamC1ERK8MxRect32P9MxPalettejRK17MxVideoParamFlags + _ZN12MxVideoParamC1ERS_@4 = _ZN12MxVideoParamC1ERS_ + _ZN12MxVideoParamC1Ev + _ZN12MxVideoParamC2ERK8MxRect32P9MxPalettejRK17MxVideoParamFlags@16 = _ZN12MxVideoParamC2ERK8MxRect32P9MxPalettejRK17MxVideoParamFlags + _ZN12MxVideoParamC2ERS_@4 = _ZN12MxVideoParamC2ERS_ + _ZN12MxVideoParamC2Ev + _ZN12MxVideoParamD1Ev + _ZN12MxVideoParamD2Ev + _ZN12MxVideoParamaSERKS_@4 = _ZN12MxVideoParamaSERKS_ + _ZN12RealtimeView13GetUserMaxLODEv + _ZN12RealtimeView13SetUserMaxLODEf + _ZN12RealtimeView17GetPartsThresholdEv + _ZN12RealtimeView17SetPartsThresholdEf + _ZN14MxVideoManager14InvalidateRectER8MxRect32@4 = _ZN14MxVideoManager14InvalidateRectER8MxRect32 + _ZN14MxVideoManager14RealizePaletteEP9MxPalette@4 = _ZN14MxVideoManager14RealizePaletteEP9MxPalette + _ZN15MxVariableTable11GetVariableEPKc@4 = _ZN15MxVariableTable11GetVariableEPKc + _ZN15MxVariableTable11SetVariableEP10MxVariable@4 = _ZN15MxVariableTable11SetVariableEP10MxVariable + _ZN15MxVariableTable11SetVariableEPKcS1_@8 = _ZN15MxVariableTable11SetVariableEPKcS1_ + _ZN16LegoInputManager10QueueEventE14NotificationIdhiih@20 = _ZN16LegoInputManager10QueueEventE14NotificationIdhiih + _ZN16LegoInputManager10UnRegisterEP6MxCore@4 = _ZN16LegoInputManager10UnRegisterEP6MxCore + _ZN16LegoInputManager8RegisterEP6MxCore@4 = _ZN16LegoInputManager8RegisterEP6MxCore + _ZN16LegoVideoManager10MoveCursorEii@8 = _ZN16LegoVideoManager10MoveCursorEii + _ZN16LegoVideoManager14EnableRMDeviceEv + _ZN16LegoVideoManager15DisableRMDeviceEv + _ZN16LegoVideoManager21EnableFullScreenMovieEhh@8 = _ZN16LegoVideoManager21EnableFullScreenMovieEhh + _ZN17LegoNavController11GetDefaultsEPiPfS1_S1_S1_S1_S1_S1_S1_S1_Ph + _ZN17LegoNavController11SetDefaultsEifffffffffh + _ZN17LegoPartPresenter26configureLegoPartPresenterEii + _ZN17MxCriticalSection10SetDoMutexEv + _ZN17MxCriticalSectionC1Ev + _ZN17MxCriticalSectionC2Ev + _ZN17MxCriticalSectionD1Ev + _ZN17MxCriticalSectionD2Ev + _ZN17MxOmniCreateFlagsC1Ev + _ZN17MxOmniCreateFlagsC2Ev + _ZN17MxOmniCreateParamC2EPKcP6HWND__R12MxVideoParam17MxOmniCreateFlags@16 = _ZN17MxOmniCreateParamC2EPKcP6HWND__R12MxVideoParam17MxOmniCreateFlags + _ZN17MxVideoParamFlagsC1Ev + _ZN17MxVideoParamFlagsC2Ev + _ZN18LegoModelPresenter27configureLegoModelPresenterEi + _ZN18LegoWorldPresenter27configureLegoWorldPresenterEi + _ZN19LegoBuildingManager28configureLegoBuildingManagerEi + _ZN19MxTransitionManager16SetWaitIndicatorEP16MxVideoPresenter@4 = _ZN19MxTransitionManager16SetWaitIndicatorEP16MxVideoPresenter + _ZN20LegoAnimationManager29configureLegoAnimationManagerEi + _ZN24MxBackgroundAudioManager6EnableEh@4 = _ZN24MxBackgroundAudioManager6EnableEh + _ZN6MxCore6NotifyER7MxParam@4 = _ZN6MxCore6NotifyER7MxParam + _ZN6MxCoreC1Ev + _ZN6MxCoreC2Ev + _ZN6MxCoreD0Ev + _ZN6MxCoreD1Ev + _ZN6MxCoreD2Ev + _ZN6MxOmni10SetSound3DEh + _ZN6MxOmni11GetInstanceEv + _ZN6MxOmni15DestroyInstanceEv + _ZN6MxOmni5GetCDEv + _ZN6MxOmni5GetHDEv + _ZN6MxOmni5SetCDEPKc + _ZN6MxOmni5SetHDEPKc + _ZN6MxOmni9IsSound3DEv + _ZN7LegoROI12SetDisplayBBEi@4 = _ZN7LegoROI12SetDisplayBBEi + _ZN7LegoROI16configureLegoROIEi + _ZN7MxTimer11GetRealTimeEv + _ZN8LegoOmni11GetInstanceEv + _ZN8LegoOmni11RemoveWorldERK8MxAtomIdi@8 = _ZN8LegoOmni11RemoveWorldERK8MxAtomIdi + _ZN8LegoOmni14CreateInstanceEv + _ZN8LegoOmni15GetCurrPathInfoEPP16LegoPathBoundaryRi + _ZN8LegoOmni21CreateBackgroundAudioEv + _ZN8MXIOINFOD1Ev + _ZN8MXIOINFOD2Ev + _ZN8MxAtomIdC1EPKc10LookupMode@8 = _ZN8MxAtomIdC1EPKc10LookupMode + _ZN8MxAtomIdC2EPKc10LookupMode@8 = _ZN8MxAtomIdC2EPKc10LookupMode + _ZN8MxAtomIdD1Ev + _ZN8MxAtomIdD2Ev + _ZN8MxAtomIdaSERKS_@4 = _ZN8MxAtomIdaSERKS_ + _ZN8MxBitmap13CreatePaletteEv + _ZN8MxBitmap4ReadEPKc@4 = _ZN8MxBitmap4ReadEPKc + _ZN8MxBitmapC1Ev + _ZN8MxBitmapC2Ev + _ZN8MxBitmapD0Ev + _ZN8MxBitmapD1Ev + _ZN8MxBitmapD2Ev + _ZN8MxDSFile13GetBufferSizeEv + _ZN8MxDSFile19GetStreamBuffersNumEv + _ZN8MxDSFile4OpenEj@4 = _ZN8MxDSFile4OpenEj + _ZN8MxDSFile4ReadEPhj@8 = _ZN8MxDSFile4ReadEPhj + _ZN8MxDSFile4SeekEii@8 = _ZN8MxDSFile4SeekEii + _ZN8MxDSFile5CloseEv + _ZN8MxDSFileC1EPKcj@8 = _ZN8MxDSFileC1EPKcj + _ZN8MxDSFileC2EPKcj@8 = _ZN8MxDSFileC2EPKcj + _ZN8MxDSFileD0Ev + _ZN8MxDSFileD1Ev + _ZN8MxDSFileD2Ev + _ZN8MxStringC1ERKS_@4 = _ZN8MxStringC1ERKS_ + _ZN8MxStringC2ERKS_@4 = _ZN8MxStringC2ERKS_ + _ZN8MxStringD0Ev + _ZN8MxStringD1Ev + _ZN8MxStringD2Ev + _ZN8MxStringaSEPKc@4 = _ZN8MxStringaSEPKc + _ZN9MxPalette6DetachEv + _ZN9MxPaletteeqERS_@4 = _ZN9MxPaletteeqERS_ diff --git a/LEGO1/LEGO1.msvc.def b/LEGO1/LEGO1.msvc.def new file mode 100644 index 00000000..7db27b54 --- /dev/null +++ b/LEGO1/LEGO1.msvc.def @@ -0,0 +1,132 @@ +LIBRARY "LEGO1.DLL" +EXPORTS + ??0LegoBackgroundColor@@QAE@PBD0@Z + ??0LegoGameState@@QAE@XZ + ??0LegoWorld@@QAE@XZ + ??0MxAtomId@@QAE@PBDW4LookupMode@@@Z + ??0MxBitmap@@QAE@XZ + ??0MxCore@@QAE@XZ + ??0MxCriticalSection@@QAE@XZ + ??0MxDSAction@@QAE@XZ + ??0MxDSFile@@QAE@PBDK@Z + ??0MxOmniCreateFlags@@QAE@XZ + ??0MxOmniCreateParam@@QAE@PBDPAUHWND__@@AAVMxVideoParam@@VMxOmniCreateFlags@@@Z + ??0MxString@@QAE@ABV0@@Z + ??0MxVideoParam@@QAE@AAV0@@Z + ??0MxVideoParam@@QAE@AAVMxRect32@@PAVMxPalette@@KAAVMxVideoParamFlags@@@Z + ??0MxVideoParam@@QAE@XZ + ??0MxVideoParamFlags@@QAE@XZ + ??1LegoEntity@@UAE@XZ + ??1LegoGameState@@QAE@XZ + ??1LegoWorld@@UAE@XZ + ??1MXIOINFO@@QAE@XZ + ??1MxAtomId@@QAE@XZ + ??1MxBitmap@@UAE@XZ + ??1MxCore@@UAE@XZ + ??1MxCriticalSection@@QAE@XZ + ??1MxDSAction@@UAE@XZ + ??1MxDSFile@@UAE@XZ + ??1MxPresenter@@UAE@XZ + ??1MxString@@UAE@XZ + ??1MxVideoParam@@QAE@XZ + ??4MxAtomId@@QAEAAV0@ABV0@@Z + ??4MxString@@QAEABV0@PBD@Z + ??4MxVideoParam@@QAEAAV0@ABV0@@Z + ??8MxPalette@@QAEEAAV0@@Z + ?BackgroundAudioManager@@YAPAVMxBackgroundAudioManager@@XZ + ?Close@MxDSFile@@UAEJXZ + ?Close@MxStreamer@@QAEJPBD@Z + ?CreateBackgroundAudio@LegoOmni@@QAEXXZ + ?CreateInstance@LegoOmni@@SAXXZ + ?CreatePalette@MxBitmap@@UAEPAVMxPalette@@XZ + ?CreateStreamObject@@YAPAVMxDSObject@@PAVMxDSFile@@F@Z + ?DestroyInstance@MxOmni@@SAXXZ + ?Detach@MxPalette@@QAEXXZ + ?DisableRMDevice@LegoVideoManager@@QAEHXZ + ?DoneTickle@MxPresenter@@MAEXXZ + ?Enable@MxBackgroundAudioManager@@QAEXE@Z + ?Enable@MxPresenter@@UAEXE@Z + ?EnableFullScreenMovie@LegoVideoManager@@QAEXEE@Z + ?EnableRMDevice@LegoVideoManager@@QAEHXZ + ?EndAction@MxPresenter@@UAEXXZ + ?EventManager@@YAPAVMxEventManager@@XZ + ?FlipToGDISurface@MxDirectDraw@@QAEHXZ + ?GameState@@YAPAVLegoGameState@@XZ + ?GetBufferSize@MxDSFile@@UAEKXZ + ?GetCD@MxOmni@@SAPBDXZ + ?GetCurrPathInfo@LegoOmni@@SAHPAPAVLegoPathBoundary@@AAH@Z + ?GetDefaults@LegoNavController@@SAXPAHPAM11111111PAE@Z + ?GetHD@MxOmni@@SAPBDXZ + ?GetInstance@LegoOmni@@SAPAV1@XZ + ?GetInstance@MxOmni@@SAPAV1@XZ + ?GetInstance@MxScheduler@@SAPAV1@XZ + ?GetNoCD_SourceName@@YAPBDXZ + ?GetPartsThreshold@RealtimeView@@SAMXZ + ?GetPrimaryBitDepth@MxDirectDraw@@SAHXZ + ?GetRealTime@MxTimer@@QAEJXZ + ?GetStreamBuffersNum@MxDSFile@@UAEKXZ + ?GetUserMaxLOD@RealtimeView@@SAMXZ + ?GetVariable@MxVariableTable@@QAEPBDPBD@Z + ?Init@MxPresenter@@IAEXXZ + ?InputManager@@YAPAVLegoInputManager@@XZ + ?InvalidateRect@MxVideoManager@@QAEXAAVMxRect32@@@Z + ?IsSound3D@MxOmni@@SAEXZ + ?Lego@@YAPAVLegoOmni@@XZ + ?Load@LegoGameState@@QAEJK@Z + ?MSoundManager@@YAPAVMxSoundManager@@XZ + ?MakeSourceName@@YAXPADPBD@Z + ?MoveCursor@LegoVideoManager@@QAEXHH@Z + ?MusicManager@@YAPAVMxMusicManager@@XZ + ?NotificationManager@@YAPAVMxNotificationManager@@XZ + ?Notify@MxCore@@UAEJAAVMxParam@@@Z + ?Open@MxDSFile@@UAEJK@Z + ?Open@MxStreamer@@QAEPAVMxStreamController@@PBDG@Z + ?ParseExtra@MxPresenter@@MAEXXZ + ?Pause@MxDirectDraw@@QAEHH@Z + ?PickEntity@@YAPAVLegoEntity@@JJ@Z + ?PickROI@@YAPAVLegoROI@@JJ@Z + ?QueueEvent@LegoInputManager@@QAEXW4NotificationId@@EJJE@Z + ?Read@MxBitmap@@UAEJPBD@Z + ?Read@MxDSFile@@UAEJPAEK@Z + ?RealizePalette@MxVideoManager@@UAEJPAVMxPalette@@@Z + ?Register@LegoInputManager@@QAEXPAVMxCore@@@Z + ?RemoveAll@ViewManager@@QAEXPAVViewROI@@@Z + ?RemoveWorld@LegoOmni@@QAEXABVMxAtomId@@J@Z + ?Save@LegoGameState@@QAEJK@Z + ?Seek@MxDSFile@@UAEJJH@Z + ?SerializePlayersInfo@LegoGameState@@QAEXF@Z + ?SerializeScoreHistory@LegoGameState@@QAEXF@Z + ?SetCD@MxOmni@@SAXPBD@Z + ?SetDefaults@LegoNavController@@SAXHMMMMMMMMME@Z + ?SetDeviceName@MxVideoParam@@QAEXPAD@Z + ?SetDisplayBB@LegoROI@@QAEXH@Z + ?SetDoMutex@MxCriticalSection@@SAXXZ + ?SetHD@MxOmni@@SAXPBD@Z + ?SetObjectName@MxDSObject@@QAEXPBD@Z + ?SetOmniUserMessage@@YAXP6AXPBDH@Z@Z + ?SetPartsThreshold@RealtimeView@@SAXM@Z + ?SetSavePath@LegoGameState@@QAEXPAD@Z + ?SetSound3D@MxOmni@@SAXE@Z + ?SetUserMaxLOD@RealtimeView@@SAXM@Z + ?SetVariable@MxVariableTable@@QAEXPAVMxVariable@@@Z + ?SetVariable@MxVariableTable@@QAEXPBD0@Z + ?SetWaitIndicator@MxTransitionManager@@QAEXPAVMxVideoPresenter@@@Z + ?SoundManager@@YAPAVLegoSoundManager@@XZ + ?Start@@YAJPAVMxDSAction@@@Z + ?StartAction@MxPresenter@@UAEJPAVMxStreamController@@PAVMxDSAction@@@Z + ?StartMultiTasking@MxScheduler@@QAEXK@Z + ?Streamer@@YAPAVMxStreamer@@XZ + ?Tickle@MxPresenter@@UAEJXZ + ?TickleManager@@YAPAVMxTickleManager@@XZ + ?Timer@@YAPAVMxTimer@@XZ + ?TransitionManager@@YAPAVMxTransitionManager@@XZ + ?UnRegister@LegoInputManager@@QAEXPAVMxCore@@@Z + ?VariableTable@@YAPAVMxVariableTable@@XZ + ?VideoManager@@YAPAVLegoVideoManager@@XZ + ?configureLegoAnimationManager@LegoAnimationManager@@SAXH@Z + ?configureLegoBuildingManager@LegoBuildingManager@@SAXH@Z + ?configureLegoModelPresenter@LegoModelPresenter@@SAXH@Z + ?configureLegoPartPresenter@LegoPartPresenter@@SAXHH@Z + ?configureLegoROI@LegoROI@@SAXH@Z + ?configureLegoWorldPresenter@LegoWorldPresenter@@SAXH@Z + _DllMain@12 diff --git a/LEGO1/omni/src/system/mxthread.cpp b/LEGO1/omni/src/system/mxthread.cpp index 401860a1..158c0cf6 100644 --- a/LEGO1/omni/src/system/mxthread.cpp +++ b/LEGO1/omni/src/system/mxthread.cpp @@ -1,4 +1,3 @@ - #include "mxthread.h" #include "decomp.h"