diff options
| author | Lywx <kiritodev01@gmail.com> | 2024-05-27 12:59:51 -0600 |
|---|---|---|
| committer | louist103 <35883445+louist103@users.noreply.github.com> | 2024-05-30 21:04:03 -0400 |
| commit | b002f28757a7ff9f928a4d9dd1834137edb144bb (patch) | |
| tree | e746f3edffa26f9334d925bea333795d08b204e9 | |
| parent | ce2d63d8dd594a8ebc35073868d071aa36258317 (diff) | |
Fixed f3dex2 conflicts with libultraship (#25)
| -rw-r--r-- | ZAPD/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | ZAPD/ZDisplayList.cpp | 7 |
2 files changed, 3 insertions, 10 deletions
diff --git a/ZAPD/CMakeLists.txt b/ZAPD/CMakeLists.txt index 49963ca..34c983f 100644 --- a/ZAPD/CMakeLists.txt +++ b/ZAPD/CMakeLists.txt @@ -143,11 +143,7 @@ source_group("Source Files" FILES ${Source_Files}) set(Source_Files__Libraries__libgfxd
"../lib/libgfxd/gfxd.c"
"../lib/libgfxd/uc.c"
- "../lib/libgfxd/uc_f3d.c"
- "../lib/libgfxd/uc_f3db.c"
- "../lib/libgfxd/uc_f3dex.c"
"../lib/libgfxd/uc_f3dex2.c"
- "../lib/libgfxd/uc_f3dexb.c"
)
source_group("Source Files\\Libraries\\libgfxd" FILES ${Source_Files__Libraries__libgfxd})
@@ -431,7 +427,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang|AppleClang") $<$<COMPILE_LANGUAGE:CXX>:-Wno-deprecated-enum-enum-conversion>
-pthread
)
-
+
if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
target_link_options(${PROJECT_NAME} PUBLIC
-pthread
diff --git a/ZAPD/ZDisplayList.cpp b/ZAPD/ZDisplayList.cpp index 66759fe..03a1f01 100644 --- a/ZAPD/ZDisplayList.cpp +++ b/ZAPD/ZDisplayList.cpp @@ -1783,7 +1783,7 @@ static int32_t GfxdCallback_Vtx(uint32_t seg, int32_t count) } self->references.push_back(seg); - + if (!Globals::Instance->otrMode) gfxd_puts("@r"); @@ -2120,10 +2120,7 @@ std::string ZDisplayList::ProcessGfxDis([[maybe_unused]] const std::string& pref gfxd_enable(gfxd_emit_dec_color); // use decimal for colors // set microcode. see gfxd.h for more options. - if (dListType == DListType::F3DZEX) - gfxd_target(gfxd_f3dex2); - else - gfxd_target(gfxd_f3dex); + gfxd_target(gfxd_f3dex2); gfxd_udata_set(this); gfxd_execute(); // generate display list |