Fix mod demo CI linkage and signing

This commit is contained in:
Luke Street
2026-07-10 01:45:05 -06:00
parent 84e7394d5b
commit 50565b37fc
5 changed files with 12 additions and 4 deletions
+6
View File
@@ -64,6 +64,9 @@ function(add_mod target_name)
WINDOWS_EXPORT_ALL_SYMBOLS OFF)
target_compile_features(${target_name} PRIVATE cxx_std_20)
target_link_libraries(${target_name} PRIVATE dusklight_game_headers)
if (TARGET dawn::webgpu_dawn)
target_link_libraries(${target_name} PRIVATE dawn::webgpu_dawn)
endif ()
if (NOT TARGET dusklight)
# Apply global compile options for out-of-tree mod builds
@@ -255,6 +258,9 @@ function(install_bundled_mods)
install(DIRECTORY "${_stage}/" DESTINATION "${_bundle_dir}/Contents/Resources/mods/${_id}")
install(CODE "execute_process(COMMAND /usr/bin/codesign --force --sign - \"${_bundle_dir}/Contents/Resources/mods/${_id}/${_lib_name}\" COMMAND_ERROR_IS_FATAL ANY)")
endforeach ()
if (TARGET crashpad_handler)
install(CODE "execute_process(COMMAND /usr/bin/codesign --force --sign - \"${_bundle_dir}/Contents/MacOS/$<TARGET_FILE_NAME:crashpad_handler>\" COMMAND_ERROR_IS_FATAL ANY)")
endif ()
install(CODE "execute_process(COMMAND /usr/bin/codesign --force --sign - --entitlements \"${DUSK_ENTITLEMENTS}\" \"${_bundle_dir}\" COMMAND_ERROR_IS_FATAL ANY)")
endif ()
return ()
+1 -1
View File
@@ -1049,7 +1049,7 @@ public:
STATIC_ASSERT(122384 == sizeof(dComIfG_inf_c));
extern dComIfG_inf_c g_dComIfG_gameInfo;
DUSK_GAME_EXTERN dComIfG_inf_c g_dComIfG_gameInfo;
extern GXColor g_blackColor;
extern GXColor g_clearColor;
extern GXColor g_whiteColor;
+1 -1
View File
@@ -471,7 +471,7 @@ public:
/* 0x130C */ u8 staffroll_next_timer;
}; // Size: 0x1310
extern dScnKy_env_light_c g_env_light;
DUSK_GAME_EXTERN dScnKy_env_light_c g_env_light;
STATIC_ASSERT(sizeof(dScnKy_env_light_c) == 4880);
@@ -5,6 +5,7 @@
#include "JSystem/J3DAssert.h"
#include "JSystem/J3DGraphBase/J3DFifo.h"
#include "JSystem/JMath/JMath.h"
#include "global.h"
#include <mtx.h>
#include "dusk/endian_gx.hpp"
@@ -203,7 +204,7 @@ public:
static void resetVcdVatCache() { sOldVcdVatCmd = NULL; }
static void* sOldVcdVatCmd;
static DUSK_GAME_DATA void* sOldVcdVatCmd;
static bool sEnvelopeFlag;
private:
@@ -8,6 +8,7 @@
#include "JSystem/JMath/JMath.h"
#include "dusk/frame_interpolation.h"
#include "dusk/endian.h"
#include "global.h"
enum J3DSysDrawBuf {
/* 0x0 */ J3DSysDrawBuf_Opa,
@@ -208,6 +209,6 @@ struct J3DSys {
};
extern u32 j3dDefaultViewNo;
extern J3DSys j3dSys;
DUSK_GAME_EXTERN J3DSys j3dSys;
#endif /* J3DSYS_H */