From 2df103071449ce0fa5eb00f831b627fd18140fb9 Mon Sep 17 00:00:00 2001 From: Roman Masanin <36927roma@gmail.com> Date: Fri, 30 Jun 2023 02:33:31 +0200 Subject: [PATCH] update nmake2, fix build --- LEGO1/legoomni.cpp | 18 ------------------ LEGO1/legopartpresenter.h | 2 ++ nmake2 | 2 +- premake5.lua | 5 ++++- 4 files changed, 7 insertions(+), 20 deletions(-) diff --git a/LEGO1/legoomni.cpp b/LEGO1/legoomni.cpp index 74f072f7..a803a88f 100644 --- a/LEGO1/legoomni.cpp +++ b/LEGO1/legoomni.cpp @@ -164,24 +164,6 @@ unsigned char LegoOmni::vtable40() return 0; } -MxStreamer* Streamer() -{ - // FIXME: Stub - return 0; -} - -MxTickleManager* TickleManager() -{ - // FIXME: Stub - return 0; -} - -MxVariableTable* VariableTable() -{ - // FIXME: Stub - return 0; -} - long Start(MxDSAction* a) { // FIXME: Stub diff --git a/LEGO1/legopartpresenter.h b/LEGO1/legopartpresenter.h index 6a9a91a5..73be1709 100644 --- a/LEGO1/legopartpresenter.h +++ b/LEGO1/legopartpresenter.h @@ -1,6 +1,8 @@ #ifndef LEGOPARTPRESENTER_H #define LEGOPARTPRESENTER_H +#include "mxmediapresenter.h" + // VTABLE 0x100d4df0 // SIZE 0x54 (from inlined construction at 0x10009fac) class LegoPartPresenter : public MxMediaPresenter diff --git a/nmake2 b/nmake2 index 3d04ffed..ecc6c938 160000 --- a/nmake2 +++ b/nmake2 @@ -1 +1 @@ -Subproject commit 3d04ffed77947de5c16c044f4c1e47c812ba3ec6 +Subproject commit ecc6c938d120d06a9df14a716f9ca2fceb0173e2 diff --git a/premake5.lua b/premake5.lua index 342b781c..ff356c1b 100644 --- a/premake5.lua +++ b/premake5.lua @@ -112,6 +112,9 @@ project "isle" filter { "action:nmake2" } --flag /ML or /MLd staticruntime "libc" + + filter { "configurations:Release", "action:nmake2" } + linkoptions { "/incremental:no" } filter { "action:not nmake2" } --flag /MT or /MTd @@ -142,6 +145,6 @@ project "lego1" files { addSrcFiles("LEGO1") } filter { "platforms:win*" } - links { "kernel32", "dsound", "advapi32", "user32", "Gdi32", "Winmm" } + links { "kernel32", "dsound", "advapi32", "user32", "Gdi32", "Winmm" } filter {}