From 286897398cd6b333a4aec76f04b633a664d46ec1 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Date: Tue, 12 May 2020 21:20:57 +0500 Subject: [PATCH] Fix build on linux --- .gitignore | 5 +++++ CMakeLists.txt | 4 ++-- devices/dbdma.cpp | 7 ++++--- devices/i2c.h | 5 +++-- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index e0f6093..2e0e448 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,8 @@ dingusppc.exe # Ignore system files .DS_Store Thumb.db + +# IDE ignores +build +build-* +*.user diff --git a/CMakeLists.txt b/CMakeLists.txt index ce69bb8..69ea61b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,7 @@ target_link_libraries(dingusppc "${PROJECT_SOURCE_DIR}/thirdparty/SDL2/lib/x64/S "${PROJECT_SOURCE_DIR}/thirdparty/SDL2/lib/x64/SDL2main.lib" libsoundio_static ${LIBSOUNDIO_LIBS}) else() -target_link_libraries(dingusppc libsoundio_static ${LIBSOUNDIO_LIBS} ${SDL2_LIBRARIES}) +target_link_libraries(dingusppc libsoundio_static ${LIBSOUNDIO_LIBS} ${SDL2_LIBRARIES} ${CMAKE_DL_LIBS}) endif() @@ -68,7 +68,7 @@ target_link_libraries(testppc "${PROJECT_SOURCE_DIR}/thirdparty/SDL2/lib/x64/SDL "${PROJECT_SOURCE_DIR}/thirdparty/SDL2/lib/x64/SDL2main.lib" libsoundio_static ${LIBSOUNDIO_LIBS}) else() -target_link_libraries(testppc libsoundio_static ${LIBSOUNDIO_LIBS} ${SDL2_LIBRARIES}) +target_link_libraries(testppc libsoundio_static ${LIBSOUNDIO_LIBS} ${SDL2_LIBRARIES} ${CMAKE_DL_LIBS}) endif() add_custom_command( diff --git a/devices/dbdma.cpp b/devices/dbdma.cpp index 8e57d3a..70de13c 100644 --- a/devices/dbdma.cpp +++ b/devices/dbdma.cpp @@ -21,11 +21,12 @@ along with this program. If not, see . /** @file Descriptor-based direct memory access emulation. */ -#include -#include #include "dbdma.h" -#include "endianswap.h" #include "cpu/ppc/ppcmmu.h" +#include "endianswap.h" +#include +#include +#include void DMAChannel::get_next_cmd(uint32_t cmd_addr, DMACmd *p_cmd) { diff --git a/devices/i2c.h b/devices/i2c.h index 01ae65d..7478161 100644 --- a/devices/i2c.h +++ b/devices/i2c.h @@ -27,9 +27,10 @@ along with this program. If not, see . #ifndef I2C_H #define I2C_H -#include -#include +#include #include +#include +#include /** Base class for I2C devices */ class I2CDevice {