Skip to content

Fix build errors and update CMakeLists.txt #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkbenaim merged 2 commits into from
Oct 26, 2025
Merged

Fix build errors and update CMakeLists.txt #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de6a1c1
build: Update minimum CMake version and fix OpenGL target_link_librar…
carmiker Oct 24, 2025
9be3a60
multiple: Fix build errors on modern gcc
carmiker Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# 'LICENSE', which is part of this source code package.
#

cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 3.15)
project(cen64 C)

set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules" ${CMAKE_MODULE_PATH})
Expand Down Expand Up @@ -480,7 +480,7 @@ add_executable(cen64
target_link_libraries(cen64
${EXTRA_OS_LIBS}
${OPENAL_LIBRARY}
${OPENGL_gl_LIBRARY}
${OPENGL_LIBRARY}
${ICONV_LIBRARIES}
${VIDEO_LIB}
${CMAKE_THREAD_LIBS_INIT}
Expand Down
2 changes: 1 addition & 1 deletion cen64.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ int run_device(struct cen64_device *device, bool no_video) {
return 1;
}

cen64_thread_setname(thread, "device");
cen64_thread_setname(&thread, "device");

if (!no_video)
cen64_gl_window_thread(device);
Expand Down
4 changes: 2 additions & 2 deletions device/device.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ int device_multithread_spin(struct cen64_device *device) {
}


cen64_thread_setname(vr4300_thread, "vr4300");
cen64_thread_setname(&vr4300_thread, "vr4300");

run_rcp_thread(device);

Expand Down Expand Up @@ -351,4 +351,4 @@ int device_debug_spin(struct cen64_device *device) {

cen64_cold void device_connect_debugger(struct cen64_device *device, void* break_handler_data, vr4300_debug_break_handler break_handler) {
vr4300_connect_debugger(device->vr4300, break_handler_data, break_handler);
}
}
8 changes: 5 additions & 3 deletions vr4300/interface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ void signal_rcp_interrupt(struct vr4300 *vr4300, enum rcp_interrupt_mask mask) {
}

// Reads a word from the MI MMIO register space.
int read_mi_regs(struct vr4300 *vr4300, uint32_t address, uint32_t *word) {
int read_mi_regs(void *vr4300_ptr, uint32_t address, uint32_t *word) {
struct vr4300* vr4300 = (struct vr4300*)vr4300_ptr;
uint32_t offset = address - MI_REGS_BASE_ADDRESS;
enum mi_register reg = (offset >> 2);

Expand All @@ -99,7 +100,8 @@ int read_mi_regs(struct vr4300 *vr4300, uint32_t address, uint32_t *word) {
}

// Writes a word to the MI MMIO register space.
int write_mi_regs(struct vr4300 *vr4300, uint32_t address, uint32_t word, uint32_t dqm) {
int write_mi_regs(void *vr4300_ptr, uint32_t address, uint32_t word, uint32_t dqm) {
struct vr4300* vr4300 = (struct vr4300*)vr4300_ptr;
uint32_t offset = address - MI_REGS_BASE_ADDRESS;
enum mi_register reg = (offset >> 2);
uint32_t result;
Expand Down Expand Up @@ -239,4 +241,4 @@ bool vr4300_read_word_vaddr(struct vr4300 *vr4300, uint64_t vaddr, uint32_t* res
}

return true;
}
}
4 changes: 2 additions & 2 deletions vr4300/interface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ uint64_t vr4300_get_pc(struct vr4300 *vr4300);

bool vr4300_read_word_vaddr(struct vr4300 *vr4300, uint64_t vaddr, uint32_t* result);

int read_mi_regs(struct vr4300 *vr4300, uint32_t address, uint32_t *word);
int write_mi_regs(struct vr4300 *vr4300, uint32_t address, uint32_t word, uint32_t dqm);
int read_mi_regs(void *vr4300_ptr, uint32_t address, uint32_t *word);
int write_mi_regs(void *vr4300_ptr, uint32_t address, uint32_t word, uint32_t dqm);

void clear_rcp_interrupt(struct vr4300 *vr4300, enum rcp_interrupt_mask mask);
void signal_rcp_interrupt(struct vr4300 *vr4300, enum rcp_interrupt_mask mask);
Expand Down
Loading