CDVDlinuz:

* move content of version.h into CDVDlinuz.h (avoid a conflict with version.h located in /usr/include/alsa)
* allow cmake to build it.


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3654 96395faa-99c1-11dd-bbfe-3dabce05a288

cmake/SelectPcsx2Plugins.cmake

@@ -81,6 +81,11 @@ else(BZIP2_FOUND)
     message(STATUS "${msg_dep_cdvdiso}")
 endif(BZIP2_FOUND)
 
+#---------------------------------------
+#			CDVDlinuz
+#---------------------------------------
+set(CDVDlinuz TRUE)
+
 #---------------------------------------
 #			dev9null
 #---------------------------------------
@@ -219,7 +224,6 @@ set(USBnull TRUE)
 #			[TODO] Write CMakeLists.txt for these plugins.
 set(cdvdGigaherz FALSE)
 set(CDVDisoEFP FALSE)
-set(CDVDlinuz FALSE)
 set(CDVDolio FALSE)
 set(CDVDpeops FALSE)
 set(GSdx FALSE)

plugins/CDVDlinuz/Src/CMakeLists.txt

@@ -5,7 +5,6 @@ set(Output CDVDlinuz)
 
 set(CommonFlags
     -Wall
-    -fPIC
     -D_LARGEFILE64_SOURCE
     )
 
@@ -48,8 +47,8 @@ set(CDVDlinuzHeaders
     PS2Edefs.h
     PS2Etypes.h
     # ERROR It takes /usr/include/alsa/version.h
-    # Either fix include dir. Or rename the file. Or mv stuff into in another include file.
-    version.h
+    # The content was move to Linux/CDVDlinuz.h
+    # version.h
 )
 
 # CDVDlinuz Linux sources

plugins/CDVDlinuz/Src/Linux/CDVDlinuz.c

@@ -47,8 +47,6 @@
 #include "DVD.h" // InitDVDInfo()
 #include "device.h"
 
-#include "../version.h"
-
 
 // Globals
 

plugins/CDVDlinuz/Src/Linux/CDVDlinuz.h

@@ -38,7 +38,14 @@
 
 #define __CDVDLINUZ_H__
 
+#define CDVDdefs
+#include "PS2Edefs.h"
 
+extern char *libname;
+
+extern const unsigned char version;
+extern const unsigned char revision;
+extern const unsigned char build;
 
 
 
@@ -50,13 +57,7 @@
 
 #define VERBOSE_DISC_TYPE
 
-
-
 #define READ_AHEAD_BUFFERS 32
 
-
-
-
-
 #endif /* __CDVDLINUZ_H__ */
 

plugins/CDVDlinuz/Src/Linux/aboutbox.c

@@ -62,7 +62,7 @@
 
 
 
-#include "version.h"
+#include "CDVDlinuz.h"
 
 #include "aboutbox.h"