mirror-games/dca3-game
1
0
Fork 0
mirror of https://gitlab.com/skmp/dca3-game.git synced 2025-09-25 13:49:18 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix dreamsdk texconv built

Browse Source
This commit is contained in:
Stefanos Kornilios Mitsis Poiitidis
2025-02-23 10:19:39 +02:00
parent 6417767ee5
commit 1d8d0ce185
4 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dreamcast/Makefile
View File

@@ -286,7 +286,7 @@ texconv: $(OBJS_TEXCONV) | pvrtex # You'll have to rebuild pvrtex manually if yo
$(CXX) -o $@ $(OBJS_TEXCONV) $(CXX) -o $@ $(OBJS_TEXCONV)
%.texconv.o: %.cpp %.texconv.o: %.cpp
$(CXX) -std=c++2a -c -O0 -g -MMD -MP -o $@ -I../vendor/koshle -I../vendor/librw/src $(INCLUDE) -I../vendor/emu -I../vendor/crypto -I../vendor/TriStripper/include $(DEFINES) -DDC_TEXCONV -DDC_SIM -D_INC_WINDOWS $(TEXCONV_FLAGS) $< $(CXX) -std=c++2a -c -O0 -g -MMD -MP -o $@ -I../vendor/koshle -I../vendor/librw/src $(INCLUDE) -I../vendor/emu -I../vendor/crypto -I../vendor/TriStripper/include $(DEFINES) -DDC_TEXCONV -DDC_SIM $(TEXCONV_FLAGS) $<
-include $(DEPS) -include $(DEPS)

18
miami/rw/VisibilityPlugins.cpp
View File

@@ -860,20 +860,20 @@ CVisibilityPlugins::PluginAttach(void)
// //
void* void*
CVisibilityPlugins::AtomicConstructor(void *object, int32, int32) CVisibilityPlugins::AtomicConstructor(void *object, RwInt32, RwInt32)
{ {
ATOMICEXT(object)->modelInfo = nil; ATOMICEXT(object)->modelInfo = nil;
return object; return object;
} }
void* void*
CVisibilityPlugins::AtomicDestructor(void *object, int32, int32) CVisibilityPlugins::AtomicDestructor(void *object, RwInt32, RwInt32)
{ {
return object; return object;
} }
void* void*
CVisibilityPlugins::AtomicCopyConstructor(void *dst, const void *src, int32, int32) CVisibilityPlugins::AtomicCopyConstructor(void *dst, const void *src, RwInt32, RwInt32)
{ {
*ATOMICEXT(dst) = *ATOMICEXT(src); *ATOMICEXT(dst) = *ATOMICEXT(src);
return dst; return dst;
@@ -930,20 +930,20 @@ CVisibilityPlugins::SetAtomicRenderCallback(RpAtomic *atomic, RpAtomicCallBackRe
// //
void* void*
CVisibilityPlugins::FrameConstructor(void *object, int32, int32) CVisibilityPlugins::FrameConstructor(void *object, RwInt32, RwInt32)
{ {
FRAMEEXT(object)->id = 0; FRAMEEXT(object)->id = 0;
return object; return object;
} }
void* void*
CVisibilityPlugins::FrameDestructor(void *object, int32, int32) CVisibilityPlugins::FrameDestructor(void *object, RwInt32, RwInt32)
{ {
return object; return object;
} }
void* void*
CVisibilityPlugins::FrameCopyConstructor(void *dst, const void *src, int32, int32) CVisibilityPlugins::FrameCopyConstructor(void *dst, const void *src, RwInt32, RwInt32)
{ {
*FRAMEEXT(dst) = *FRAMEEXT(src); *FRAMEEXT(dst) = *FRAMEEXT(src);
return dst; return dst;
@@ -967,7 +967,7 @@ CVisibilityPlugins::GetFrameHierarchyId(RwFrame *frame)
// //
void* void*
CVisibilityPlugins::ClumpConstructor(void *object, int32, int32) CVisibilityPlugins::ClumpConstructor(void *object, RwInt32, RwInt32)
{ {
ClumpExt *ext = CLUMPEXT(object); ClumpExt *ext = CLUMPEXT(object);
ext->visibilityCB = DefaultVisibilityCB; ext->visibilityCB = DefaultVisibilityCB;
@@ -976,13 +976,13 @@ CVisibilityPlugins::ClumpConstructor(void *object, int32, int32)
} }
void* void*
CVisibilityPlugins::ClumpDestructor(void *object, int32, int32) CVisibilityPlugins::ClumpDestructor(void *object, RwInt32, RwInt32)
{ {
return object; return object;
} }
void* void*
CVisibilityPlugins::ClumpCopyConstructor(void *dst, const void *src, int32, int32) CVisibilityPlugins::ClumpCopyConstructor(void *dst, const void *src, RwInt32, RwInt32)
{ {
CLUMPEXT(dst)->visibilityCB = CLUMPEXT(src)->visibilityCB; CLUMPEXT(dst)->visibilityCB = CLUMPEXT(src)->visibilityCB;
return dst; return dst;

18
miami/rw/VisibilityPlugins.h
View File

@@ -109,10 +109,10 @@ public:
static int GetAtomicId(RpAtomic *atomic); static int GetAtomicId(RpAtomic *atomic);
static void SetAtomicRenderCallback(RpAtomic*, RpAtomicCallBackRender); static void SetAtomicRenderCallback(RpAtomic*, RpAtomicCallBackRender);
static void *AtomicConstructor(void *object, int32 offset, int32 len); static void *AtomicConstructor(void *object, RwInt32 offset, RwInt32 len);
static void *AtomicDestructor(void *object, int32 offset, int32 len); static void *AtomicDestructor(void *object, RwInt32 offset, RwInt32 len);
static void *AtomicCopyConstructor(void *dst, const void *src, static void *AtomicCopyConstructor(void *dst, const void *src,
int32 offset, int32 len); RwInt32 offset, RwInt32 len);
static int32 ms_atomicPluginOffset; static int32 ms_atomicPluginOffset;
struct FrameExt struct FrameExt
@@ -123,10 +123,10 @@ public:
static void SetFrameHierarchyId(RwFrame *frame, intptr id); static void SetFrameHierarchyId(RwFrame *frame, intptr id);
static intptr GetFrameHierarchyId(RwFrame *frame); static intptr GetFrameHierarchyId(RwFrame *frame);
static void *FrameConstructor(void *object, int32 offset, int32 len); static void *FrameConstructor(void *object, RwInt32 offset, RwInt32 len);
static void *FrameDestructor(void *object, int32 offset, int32 len); static void *FrameDestructor(void *object, RwInt32 offset, RwInt32 len);
static void *FrameCopyConstructor(void *dst, const void *src, static void *FrameCopyConstructor(void *dst, const void *src,
int32 offset, int32 len); RwInt32 offset, RwInt32 len);
static int32 ms_framePluginOffset; static int32 ms_framePluginOffset;
struct ClumpExt struct ClumpExt
@@ -140,10 +140,10 @@ public:
static int GetClumpAlpha(RpClump*); static int GetClumpAlpha(RpClump*);
static bool IsClumpVisible(RpClump*); static bool IsClumpVisible(RpClump*);
static void *ClumpConstructor(void *object, int32 offset, int32 len); static void *ClumpConstructor(void *object, RwInt32 offset, RwInt32 len);
static void *ClumpDestructor(void *object, int32 offset, int32 len); static void *ClumpDestructor(void *object, RwInt32 offset, RwInt32 len);
static void *ClumpCopyConstructor(void *dst, const void *src, static void *ClumpCopyConstructor(void *dst, const void *src,
int32 offset, int32 len); RwInt32 offset, RwInt32 len);
static int32 ms_clumpPluginOffset; static int32 ms_clumpPluginOffset;
static bool PluginAttach(void); static bool PluginAttach(void);

3
miami/skel/crossplatform.h
View File

@@ -23,7 +23,8 @@ char *_strdate(char *buf);
// NOTE: It's perfectly fine to include <Windows.h> here, but it can increase build size and time in *some* conditions, and maybe substantially in future if we'll use crossplatform.h more. // NOTE: It's perfectly fine to include <Windows.h> here, but it can increase build size and time in *some* conditions, and maybe substantially in future if we'll use crossplatform.h more.
#ifndef _INC_WINDOWS #ifndef _INC_WINDOWS
#ifndef __MWERKS__ #ifndef __MWERKS__
#include <IntSafe.h> // #include <IntSafe.h> // DreamSDK doesn't have IntSafe.h
#include <Windows.h>
#else #else
#include <Windows.h> #include <Windows.h>
#endif #endif