From 9522b1b9e4d400ae2d9ba73b62aa318a1a61f9e3 Mon Sep 17 00:00:00 2001 From: "gregory.hainaut" Date: Sun, 11 Jul 2010 10:45:14 +0000 Subject: [PATCH] [CDVDnull] * include a common file to define sysmessage * Do not compile useless CDVDnull/Linux/* files git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3460 96395faa-99c1-11dd-bbfe-3dabce05a288 --- plugins/CDVDnull/CDVD.h | 1 + plugins/CDVDnull/CMakeLists.txt | 29 +++++++++++++++-------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/plugins/CDVDnull/CDVD.h b/plugins/CDVDnull/CDVD.h index 533fa10441..99c996a1ff 100644 --- a/plugins/CDVDnull/CDVD.h +++ b/plugins/CDVDnull/CDVD.h @@ -23,6 +23,7 @@ #define CDVDdefs #include "PS2Edefs.h" +#include "PS2Eext.h" #ifdef __LINUX__ #include diff --git a/plugins/CDVDnull/CMakeLists.txt b/plugins/CDVDnull/CMakeLists.txt index 24b0899b77..3ce3f45502 100644 --- a/plugins/CDVDnull/CMakeLists.txt +++ b/plugins/CDVDnull/CMakeLists.txt @@ -45,19 +45,19 @@ set(CDVDnullSources set(CDVDnullHeaders CDVD.h) -# CDVDnull Linux sources -set(CDVDnullLinuxSources - Linux/callbacks.c - Linux/Config.cpp - Linux/interface.c - Linux/support.c) +# # CDVDnull Linux sources +# set(CDVDnullLinuxSources +# Linux/callbacks.c +# Linux/Config.cpp +# Linux/interface.c +# Linux/support.c) -# CDVDnull Linux headers -set(CDVDnullLinuxHeaders - Linux/callbacks.h - Linux/Config.h - Linux/interface.h - Linux/support.h) +# # CDVDnull Linux headers +# set(CDVDnullLinuxHeaders +# Linux/callbacks.h +# Linux/Config.h +# Linux/interface.h +# Linux/support.h) # CDVDnull Windows sources set(CDVDnullWindowsSources @@ -75,8 +75,9 @@ include_directories(.) add_library(${CDVDnullName} SHARED ${CDVDnullSources} ${CDVDnullHeaders} - ${CDVDnullLinuxSources} - ${CDVDnullLinuxHeaders}) + #${CDVDnullLinuxSources} + #${CDVDnullLinuxHeaders} + ) # Force the linker into 32 bits mode target_link_libraries(${CDVDnullName} -m32)