Indent, changelog and submodule update

1 files changed, 122 insertions, 122 deletions

diff --git a/compiler.pri b/compiler.pri
index b33b880bc..2277c6e49 100644
--- a/compiler.pri
+++ b/compiler.pri
@@ -1,122 +1,122 @@
-CONFIG *= warn_on

-

-win32 {

-	INCLUDEPATH *= /dev/WinSDK/include /dev/dxsdk/Include /dev/Boost/include/boost-1_38

-	CONFIG(intelcpp) {

-		DEFINES *= RESTRICT=restrict

-		DEFINES *= VAR_ARRAYS

-		QMAKE_CC = icl

-		QMAKE_CXX = icl

-		QMAKE_LIB = xilib /nologo

-		QMAKE_LINK = xilink

-		QMAKE_CFLAGS *= -Qstd=c99 -Qrestrict -Qvc9

-		QMAKE_CXXFLAGS *= -Qstd=c++0x -Qrestrict -Qvc9

-		# Disable IPO and -GL due to bugs in Intel C++ 11.0

-		QMAKE_CFLAGS_RELEASE *= -O3 -Ob0

-		QMAKE_CFLAGS_RELEASE -= -GL

-		QMAKE_CXXFLAGS_RELEASE *= -O3 -Ob0

-		QMAKE_CXXFLAGS_RELEASE -= -GL

-		QMAKE_CFLAGS_DEBUG *= -O2 -Ob0 

-		QMAKE_CXXFLAGS_DEBUG *= -O2 -Ob0 

-

-		CONFIG(optgen) {

-			QMAKE_CFLAGS *= -Qprof-gen

-			QMAKE_CXXFLAGS *= -Qprof-gen

-		}

-

-		CONFIG(optimize) {

-			QMAKE_CFLAGS *= -Qprof-use

-			QMAKE_CXXFLAGS *= -Qprof-use

-		}

-	} else {

-		DEFINES *= RESTRICT=

-	}

-

-	CONFIG(symbols) {

-		QMAKE_CFLAGS_RELEASE *= -GR -Zi -Oy-

-		QMAKE_CXXFLAGS_RELEASE *= -GR -Zi -Oy-

-		QMAKE_LFLAGS *= -fixed:no -debug

-	}

-	

-} else {

-	DEFINES *= RESTRICT=__restrict__

-	CONFIG(opt-gcc) {

-		QMAKE_CC = /opt/gcc/bin/gcc

-		QMAKE_CXX = /opt/gcc/bin/g++

-		QMAKE_LINK = /opt/gcc/bin/g++

-	}

-

-	QMAKE_CFLAGS *= -Wshadow -Wconversion -Wsign-compare -fvisibility=hidden

-	QMAKE_CXXFLAGS *= -Wshadow -Woverloaded-virtual -Wold-style-cast -Wconversion -Wsign-compare -fvisibility=hidden

-	!macx {

-		QMAKE_LFLAGS *= -Wl,--as-needed

-	}

-

-	CONFIG(optgen) {

-		QMAKE_CFLAGS *= -O3 -march=native -ffast-math -ftree-vectorize -fprofile-generate

-		QMAKE_CXXFLAGS *= -O3 -march=native -ffast-math -ftree-vectorize -fprofile-generate

-		QMAKE_LFLAGS *= -fprofile-generate

-	}

-

-	CONFIG(optimize) {

-		QMAKE_CFLAGS *= -O3 -march=native -ffast-math -ftree-vectorize -fprofile-use

-		QMAKE_CXXFLAGS *= -O3 -march=native -ffast-math -ftree-vectorize -fprofile-use

-	}

-

-	CONFIG(symbols) {

-		QMAKE_CFLAGS *= -g

-		QMAKE_CXXFLAGS *= -g

-	}

-}

-

-macx {

-	INCLUDEPATH *= /opt/mumble/boost

-

-	CONFIG(cocoa) {

-		QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5

-		QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.5.sdk

-

-		CONFIG += x86_64

-		QMAKE_CFLAGS += -mmmx -msse

-		QMAKE_CXXFLAGS += -mmmx -msse

-	} else {

-		QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4

-		QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4u.sdk

-

-		CONFIG(debug, debug|release) {

-			CONFIG += no-universal

-		}

-

-		!CONFIG(no-universal) {

-			CONFIG += x86 ppc

-

-			# Precompiled headers are broken when using Makefiles.

-			!macx-xcode {

-				CONFIG += no-pch

-			}

-		}

-

-		ARCH=$$system(uname -m)

-		GCC42=$$system(readlink /usr/bin/gcc | grep "gcc-4.[2-9][.0-9]*")

-		!isEmpty(GCC42):!CONFIG(no-gcc42) {

-			QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.5.sdk

-			QMAKE_CFLAGS += -mmacosx-version-min=10.4

-			QMAKE_CXXFLAGS += -mmacosx-version-min=10.4

-			contains(ARCH, 'i386') {

-				QMAKE_CFLAGS += -Xarch_i386 -mmmx -Xarch_i386 -msse -Xarch_i386 -msse2

-				QMAKE_CXXFLAGS += -Xarch_i386 -mmmx -Xarch_i386 -msse -Xarch_i386 -msse2

-			}

-		} else {

-			CONFIG(no-universal):contains(ARCH, 'i386') {

-				QMAKE_CFLAGS += -mmmx -msse -msse2

-				QMAKE_CXXFLAGS += -mmmx -msse -msse2

-			}

-		}

-	}

-}

-

-CONFIG(no-pch) {

-	CONFIG -= precompile_header

-} else {

- 	CONFIG *= precompile_header

-}

+CONFIG *= warn_on
+
+win32 {
+	INCLUDEPATH *= /dev/WinSDK/include /dev/dxsdk/Include /dev/Boost/include/boost-1_38
+	CONFIG(intelcpp) {
+		DEFINES *= RESTRICT=restrict
+		DEFINES *= VAR_ARRAYS
+		QMAKE_CC = icl
+		QMAKE_CXX = icl
+		QMAKE_LIB = xilib /nologo
+		QMAKE_LINK = xilink
+		QMAKE_CFLAGS *= -Qstd=c99 -Qrestrict -Qvc9
+		QMAKE_CXXFLAGS *= -Qstd=c++0x -Qrestrict -Qvc9
+		# Disable IPO and -GL due to bugs in Intel C++ 11.0
+		QMAKE_CFLAGS_RELEASE *= -O3 -Ob0
+		QMAKE_CFLAGS_RELEASE -= -GL
+		QMAKE_CXXFLAGS_RELEASE *= -O3 -Ob0
+		QMAKE_CXXFLAGS_RELEASE -= -GL
+		QMAKE_CFLAGS_DEBUG *= -O2 -Ob0
+		QMAKE_CXXFLAGS_DEBUG *= -O2 -Ob0
+
+		CONFIG(optgen) {
+			QMAKE_CFLAGS *= -Qprof-gen
+			QMAKE_CXXFLAGS *= -Qprof-gen
+		}
+
+		CONFIG(optimize) {
+			QMAKE_CFLAGS *= -Qprof-use
+			QMAKE_CXXFLAGS *= -Qprof-use
+		}
+	} else {
+		DEFINES *= RESTRICT=
+	}
+
+	CONFIG(symbols) {
+		QMAKE_CFLAGS_RELEASE *= -GR -Zi -Oy-
+		QMAKE_CXXFLAGS_RELEASE *= -GR -Zi -Oy-
+		QMAKE_LFLAGS *= -fixed:no -debug
+	}
+
+} else {
+	DEFINES *= RESTRICT=__restrict__
+	CONFIG(opt-gcc) {
+		QMAKE_CC = /opt/gcc/bin/gcc
+		QMAKE_CXX = /opt/gcc/bin/g++
+		QMAKE_LINK = /opt/gcc/bin/g++
+	}
+
+	QMAKE_CFLAGS *= -Wshadow -Wconversion -Wsign-compare -fvisibility=hidden
+	QMAKE_CXXFLAGS *= -Wshadow -Woverloaded-virtual -Wold-style-cast -Wconversion -Wsign-compare -fvisibility=hidden
+	!macx {
+		QMAKE_LFLAGS *= -Wl,--as-needed
+	}
+
+	CONFIG(optgen) {
+		QMAKE_CFLAGS *= -O3 -march=native -ffast-math -ftree-vectorize -fprofile-generate
+		QMAKE_CXXFLAGS *= -O3 -march=native -ffast-math -ftree-vectorize -fprofile-generate
+		QMAKE_LFLAGS *= -fprofile-generate
+	}
+
+	CONFIG(optimize) {
+		QMAKE_CFLAGS *= -O3 -march=native -ffast-math -ftree-vectorize -fprofile-use
+		QMAKE_CXXFLAGS *= -O3 -march=native -ffast-math -ftree-vectorize -fprofile-use
+	}
+
+	CONFIG(symbols) {
+		QMAKE_CFLAGS *= -g
+		QMAKE_CXXFLAGS *= -g
+	}
+}
+
+macx {
+	INCLUDEPATH *= /opt/mumble/boost
+
+	CONFIG(cocoa) {
+		QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
+		QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.5.sdk
+
+		CONFIG += x86_64
+		QMAKE_CFLAGS += -mmmx -msse
+		QMAKE_CXXFLAGS += -mmmx -msse
+	} else {
+		QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
+		QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4u.sdk
+
+		CONFIG(debug, debug|release) {
+			CONFIG += no-universal
+		}
+
+		!CONFIG(no-universal) {
+			CONFIG += x86 ppc
+
+			# Precompiled headers are broken when using Makefiles.
+			!macx-xcode {
+				CONFIG += no-pch
+			}
+		}
+
+		ARCH=$$system(uname -m)
+		GCC42=$$system(readlink /usr/bin/gcc | grep "gcc-4.[2-9][.0-9]*")
+		!isEmpty(GCC42):!CONFIG(no-gcc42) {
+			QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.5.sdk
+			QMAKE_CFLAGS += -mmacosx-version-min=10.4
+			QMAKE_CXXFLAGS += -mmacosx-version-min=10.4
+			contains(ARCH, 'i386') {
+				QMAKE_CFLAGS += -Xarch_i386 -mmmx -Xarch_i386 -msse -Xarch_i386 -msse2
+				QMAKE_CXXFLAGS += -Xarch_i386 -mmmx -Xarch_i386 -msse -Xarch_i386 -msse2
+			}
+		} else {
+			CONFIG(no-universal):contains(ARCH, 'i386') {
+				QMAKE_CFLAGS += -mmmx -msse -msse2
+				QMAKE_CXXFLAGS += -mmmx -msse -msse2
+			}
+		}
+	}
+}
+
+CONFIG(no-pch) {
+	CONFIG -= precompile_header
+} else {
+ 	CONFIG *= precompile_header
+}