Skip to content

Commit

Permalink
Use SDL3 functions in more locations (#44)
Browse files Browse the repository at this point in the history
* Use strcasecmp, strncasecmp, strlwr, strupr and itoa from SDL

* Use SDL_GetTicks instead of timeGetTime

* Use MxDSFile::OPEN_READ instead of OF_READ

* Use SDL_IOStream to read bitmaps

* Use SDL_LogXXX instead of OutputDebugString

* Undo mxvideoparam.h change

* Revert "Undo mxvideoparam.h change"

This reverts commit 4a20cf6.

* Fix _MxTrace

* Reapply "Undo mxvideoparam.h change"

This reverts commit b3a09dc.

* fix _MxTrace

* Use __declspec(dllexport) for exporting symbols from dll

Refactored CMake script such that all objects are passed to the lego1 library.

* clang-format

* fix msvc build

* MSVC fixed for real now?

* Forgot about d3drm_guid

* Fix naming issue

* Use Uint64 in LegoCarBuild::Tickle for dTime
  • Loading branch information
madebr authored Dec 25, 2024
1 parent 9db0e79 commit bb4db6c
Show file tree
Hide file tree
Showing 86 changed files with 419 additions and 764 deletions.
247 changes: 74 additions & 173 deletions CMakeLists.txt

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions ISLE/isleapp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -185,13 +185,11 @@ MxS32 IsleApp::SetupLegoOmni()
#ifdef COMPAT_MODE
MxS32 failure;
{
MxOmniCreateParam param(mediaPath, (struct HWND__*) hwnd, m_videoParam, MxOmniCreateFlags());
MxOmniCreateParam param(mediaPath, hwnd, m_videoParam, MxOmniCreateFlags());
failure = Lego()->Create(param) == FAILURE;
}
#else
MxS32 failure =
Lego()->Create(MxOmniCreateParam(mediaPath, (struct HWND__*) hwnd, m_videoParam, MxOmniCreateFlags())) ==
FAILURE;
MxS32 failure = Lego()->Create(MxOmniCreateParam(mediaPath, hwnd, m_videoParam, MxOmniCreateFlags())) == FAILURE;
#endif

if (!failure) {
Expand Down
1 change: 1 addition & 0 deletions ISLE/isleapp.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef ISLEAPP_H
#define ISLEAPP_H

#include "lego1_export.h"
#include "legoutils.h"
#include "mxtypes.h"
#include "mxvideoparam.h"
Expand Down
136 changes: 0 additions & 136 deletions LEGO1/LegoOmni.def

This file was deleted.

162 changes: 0 additions & 162 deletions LEGO1/LegoOmni.mingw.def

This file was deleted.

64 changes: 0 additions & 64 deletions LEGO1/LegoOmni64.def

This file was deleted.

Loading

0 comments on commit bb4db6c

Please sign in to comment.