From 251382aefe59d2dc3bf8756bc348b0bb1a88c2dd Mon Sep 17 00:00:00 2001 From: arcum42 Date: Sat, 29 Oct 2011 07:57:06 +0000 Subject: [PATCH] Change a few compiler options in Linux to remove a few warnings during compilation. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4947 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/CMakeLists.txt | 3 ++- pcsx2/PrecompiledHeader.h | 6 +++++- plugins/CDVDiso/src/CMakeLists.txt | 1 + plugins/CDVDnull/CMakeLists.txt | 1 + plugins/FWnull/CMakeLists.txt | 1 + plugins/GSdx/CMakeLists.txt | 2 ++ plugins/GSnull/CMakeLists.txt | 1 + plugins/PadNull/CMakeLists.txt | 1 + plugins/SPU2null/CMakeLists.txt | 1 + plugins/USBnull/CMakeLists.txt | 1 + plugins/dev9null/CMakeLists.txt | 1 + plugins/onepad/CMakeLists.txt | 1 + plugins/onepad/onepad.cpp | 2 +- plugins/spu2-x/src/CMakeLists.txt | 1 + plugins/zerospu2/CMakeLists.txt | 1 + plugins/zzogl-pg/opengl/CMakeLists.txt | 1 + 16 files changed, 22 insertions(+), 3 deletions(-) diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index d00daf377b..fdb04ff933 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -24,7 +24,8 @@ set(CommonFlags -Wno-format -Wno-unused-parameter -Wno-unused-value - -Wno-unused-variable) + -Wno-unused-variable + -Wno-write-strings) # set warning flags set(DebugFlags diff --git a/pcsx2/PrecompiledHeader.h b/pcsx2/PrecompiledHeader.h index 86429356f2..9d728ebec4 100644 --- a/pcsx2/PrecompiledHeader.h +++ b/pcsx2/PrecompiledHeader.h @@ -93,10 +93,14 @@ typedef FnType_Void* Fnptr_Void; // -------------------------------------------------------------------------------------- // Linux isn't set up for svn version numbers yet. -#ifdef __LINUX__ +#if defined(__LINUX__) && !defined(LINUX_PRINT_SVN_NUMBER) +#if !defined(SVN_REV) # define SVN_REV 0 +#endif +#if !defined(SVN_MODS) # define SVN_MODS 0 #endif +#endif #if defined(_MSC_VER) diff --git a/plugins/CDVDiso/src/CMakeLists.txt b/plugins/CDVDiso/src/CMakeLists.txt index edb6f1ca5c..2c51e22e42 100644 --- a/plugins/CDVDiso/src/CMakeLists.txt +++ b/plugins/CDVDiso/src/CMakeLists.txt @@ -12,6 +12,7 @@ set(Output CDVDiso) set(CommonFlags -fvisibility=hidden -Wall + -Wno-write-strings ) set(OptimizationFlags diff --git a/plugins/CDVDnull/CMakeLists.txt b/plugins/CDVDnull/CMakeLists.txt index 10d245b5ad..da6386da17 100644 --- a/plugins/CDVDnull/CMakeLists.txt +++ b/plugins/CDVDnull/CMakeLists.txt @@ -12,6 +12,7 @@ set(Output CDVDnull) set(CommonFlags -fvisibility=hidden -Wall + -Wno-write-strings ) set(OptimizationFlags diff --git a/plugins/FWnull/CMakeLists.txt b/plugins/FWnull/CMakeLists.txt index 4e3c93d110..156885337e 100644 --- a/plugins/FWnull/CMakeLists.txt +++ b/plugins/FWnull/CMakeLists.txt @@ -12,6 +12,7 @@ set(Output FWnull-0.7.0) set(CommonFlags -fvisibility=hidden -Wall + -Wno-write-strings ) set(OptimizationFlags diff --git a/plugins/GSdx/CMakeLists.txt b/plugins/GSdx/CMakeLists.txt index 34d001a9e5..6159b763a7 100644 --- a/plugins/GSdx/CMakeLists.txt +++ b/plugins/GSdx/CMakeLists.txt @@ -20,6 +20,8 @@ set(CommonFlags -Wno-unused-parameter -Wno-unused-value -Wunused-variable + -Wno-invalid-offsetof + -Wno-write-strings ) set(OptimizationFlags diff --git a/plugins/GSnull/CMakeLists.txt b/plugins/GSnull/CMakeLists.txt index ea00dc1d52..ae1597410a 100644 --- a/plugins/GSnull/CMakeLists.txt +++ b/plugins/GSnull/CMakeLists.txt @@ -12,6 +12,7 @@ set(Output GSnull) set(CommonFlags -fvisibility=hidden -Wall + -Wno-write-strings ) set(OptimizationFlags diff --git a/plugins/PadNull/CMakeLists.txt b/plugins/PadNull/CMakeLists.txt index 6c454922a4..2127a0d882 100644 --- a/plugins/PadNull/CMakeLists.txt +++ b/plugins/PadNull/CMakeLists.txt @@ -11,6 +11,7 @@ set(Output PADnull) set(CommonFlags -fvisibility=hidden -Wall + -Wno-write-strings ) set(OptimizationFlags diff --git a/plugins/SPU2null/CMakeLists.txt b/plugins/SPU2null/CMakeLists.txt index 8c1c1eb6e1..fb4aed1abc 100644 --- a/plugins/SPU2null/CMakeLists.txt +++ b/plugins/SPU2null/CMakeLists.txt @@ -12,6 +12,7 @@ set(Output SPU2null) set(CommonFlags -fvisibility=hidden -Wall + -Wno-write-strings ) set(OptimizationFlags diff --git a/plugins/USBnull/CMakeLists.txt b/plugins/USBnull/CMakeLists.txt index cec09e425e..474faad1d8 100644 --- a/plugins/USBnull/CMakeLists.txt +++ b/plugins/USBnull/CMakeLists.txt @@ -12,6 +12,7 @@ set(Output USBnull-0.7.0) set(CommonFlags -fvisibility=hidden -Wall + -Wno-write-strings ) set(OptimizationFlags diff --git a/plugins/dev9null/CMakeLists.txt b/plugins/dev9null/CMakeLists.txt index e21929d0fa..cb4516eea5 100644 --- a/plugins/dev9null/CMakeLists.txt +++ b/plugins/dev9null/CMakeLists.txt @@ -12,6 +12,7 @@ set(Output dev9null-0.5.0) set(CommonFlags -fvisibility=hidden -Wall + -Wno-write-strings ) set(OptimizationFlags diff --git a/plugins/onepad/CMakeLists.txt b/plugins/onepad/CMakeLists.txt index 12247e384c..27bc278c8d 100644 --- a/plugins/onepad/CMakeLists.txt +++ b/plugins/onepad/CMakeLists.txt @@ -12,6 +12,7 @@ set(Output onepad-1.1.0) set(CommonFlags -fvisibility=hidden -Wall + -Wno-write-strings ) set(OptimizationFlags diff --git a/plugins/onepad/onepad.cpp b/plugins/onepad/onepad.cpp index ddcd317d4b..de00e923eb 100644 --- a/plugins/onepad/onepad.cpp +++ b/plugins/onepad/onepad.cpp @@ -127,7 +127,7 @@ queue ev_fifo; static int padVib0[2]; static int padVib1[2]; -static int padVibC[2]; +//static int padVibC[2]; static int padVibF[2][4]; static void InitLibraryName() diff --git a/plugins/spu2-x/src/CMakeLists.txt b/plugins/spu2-x/src/CMakeLists.txt index 8395a9a88b..327822fd93 100644 --- a/plugins/spu2-x/src/CMakeLists.txt +++ b/plugins/spu2-x/src/CMakeLists.txt @@ -12,6 +12,7 @@ set(Output spu2x-2.0.0) set(CommonFlags -fvisibility=hidden -Wall + -Wno-write-strings ) set(OptimizationFlags diff --git a/plugins/zerospu2/CMakeLists.txt b/plugins/zerospu2/CMakeLists.txt index eb8257481d..6e9040d20e 100644 --- a/plugins/zerospu2/CMakeLists.txt +++ b/plugins/zerospu2/CMakeLists.txt @@ -12,6 +12,7 @@ set(Output zerospu2) set(CommonFlags -Wall -msse2 + -Wno-write-strings ) set(OptimizationFlags diff --git a/plugins/zzogl-pg/opengl/CMakeLists.txt b/plugins/zzogl-pg/opengl/CMakeLists.txt index 1218f46a52..fc8dba32aa 100644 --- a/plugins/zzogl-pg/opengl/CMakeLists.txt +++ b/plugins/zzogl-pg/opengl/CMakeLists.txt @@ -19,6 +19,7 @@ set(CommonFlags -Wno-unused-parameter -Wno-unused-value -Wunused-variable + -Wno-write-strings ) set(OptimizationFlags