diff --git a/code/ryzom/tools/client/client_config_qt/CMakeLists.txt b/code/ryzom/tools/client/client_config_qt/CMakeLists.txt
index 87c5d7b05..4bbf82326 100644
--- a/code/ryzom/tools/client/client_config_qt/CMakeLists.txt
+++ b/code/ryzom/tools/client/client_config_qt/CMakeLists.txt
@@ -1,6 +1,5 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${QT_INCLUDES} )
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${NEL_INCLUDE_DIR} ${QT_INCLUDES})
+INCLUDE( ${QT_USE_FILE} )
FILE( GLOB SRC *.cpp *.h )
@@ -36,9 +35,6 @@ SET( CLIENT_CONFIG_TRANS
CONFIGURE_FILE( translations/translations.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc COPYONLY )
SET( CLIENT_CONFIG_RCS resources.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc )
-SET( QT_USE_QTGUI TRUE )
-SET( QT_USE_QTOPENGL TRUE )
-SET( QT_USE_QTCORE TRUE )
QT4_ADD_TRANSLATION( CLIENT_CONFIG_QM ${CLIENT_CONFIG_TRANS} )
QT4_ADD_RESOURCES( CLIENT_CONFIG_RC_SRCS ${CLIENT_CONFIG_RCS} )
QT4_WRAP_CPP( CLIENT_CONFIG_MOC_SRC ${CLIENT_CONFIG_HDR} )
@@ -52,6 +48,11 @@ ADD_EXECUTABLE( ryzom_configuration_qt WIN32 MACOSX_BUNDLE ${SRC} ${CLIENT_CONFI
NL_DEFAULT_PROPS( ryzom_configuration_qt "Ryzom, Tools: Ryzom Configuration Qt" )
NL_ADD_RUNTIME_FLAGS( ryzom_configuration_qt )
NL_ADD_LIB_SUFFIX( ryzom_configuration_qt )
-TARGET_LINK_LIBRARIES( ryzom_configuration_qt nelmisc nel3d ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY} )
-INSTALL( TARGETS ryzom_configuration_qt RUNTIME DESTINATION games COMPONENT client BUNDLE DESTINATION /Applications )
+TARGET_LINK_LIBRARIES( ryzom_configuration_qt nelmisc nel3d ${QT_LIBRARIES})
+
+IF(WITH_PCH)
+ ADD_NATIVE_PRECOMPILED_HEADER(ryzom_configuration_qt ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
+ENDIF(WITH_PCH)
+
+INSTALL(TARGETS ryzom_configuration_qt RUNTIME DESTINATION games COMPONENT client BUNDLE DESTINATION /Applications)
diff --git a/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp b/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp
index 5c6801152..df3596980 100644
--- a/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp
+++ b/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp
@@ -14,6 +14,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see .
+#include "stdpch.h"
#include "client_config_dialog.h"
#include "general_settings_widget.h"
diff --git a/code/ryzom/tools/client/client_config_qt/config.cpp b/code/ryzom/tools/client/client_config_qt/config.cpp
index 93a757b27..73f52bca1 100644
--- a/code/ryzom/tools/client/client_config_qt/config.cpp
+++ b/code/ryzom/tools/client/client_config_qt/config.cpp
@@ -14,7 +14,8 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see .
-#include "Config.h"
+#include "stdpch.h"
+#include "config.h"
CConfig::CConfig()
{
diff --git a/code/ryzom/tools/client/client_config_qt/display_settings_advanced_widget.cpp b/code/ryzom/tools/client/client_config_qt/display_settings_advanced_widget.cpp
index 211a4911b..1262b3cc7 100644
--- a/code/ryzom/tools/client/client_config_qt/display_settings_advanced_widget.cpp
+++ b/code/ryzom/tools/client/client_config_qt/display_settings_advanced_widget.cpp
@@ -14,6 +14,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see .
+#include "stdpch.h"
#include "display_settings_advanced_widget.h"
#include "system.h"
diff --git a/code/ryzom/tools/client/client_config_qt/display_settings_details_widget.cpp b/code/ryzom/tools/client/client_config_qt/display_settings_details_widget.cpp
index aeddcf628..74b48cc45 100644
--- a/code/ryzom/tools/client/client_config_qt/display_settings_details_widget.cpp
+++ b/code/ryzom/tools/client/client_config_qt/display_settings_details_widget.cpp
@@ -14,9 +14,11 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see .
-#include "system.h"
+#include "stdpch.h"
#include "display_settings_details_widget.h"
+#include "system.h"
+
CDisplaySettingsDetailsWidget::CDisplaySettingsDetailsWidget( QWidget *parent ) :
CWidgetBase( parent )
{
diff --git a/code/ryzom/tools/client/client_config_qt/display_settings_widget.cpp b/code/ryzom/tools/client/client_config_qt/display_settings_widget.cpp
index f6775a0b7..5d61c09cd 100644
--- a/code/ryzom/tools/client/client_config_qt/display_settings_widget.cpp
+++ b/code/ryzom/tools/client/client_config_qt/display_settings_widget.cpp
@@ -14,8 +14,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see .
-#include
-#include
+#include "stdpch.h"
#include "display_settings_widget.h"
#include "system.h"
#include
diff --git a/code/ryzom/tools/client/client_config_qt/general_settings_widget.cpp b/code/ryzom/tools/client/client_config_qt/general_settings_widget.cpp
index fcb85dec2..b874b60ed 100644
--- a/code/ryzom/tools/client/client_config_qt/general_settings_widget.cpp
+++ b/code/ryzom/tools/client/client_config_qt/general_settings_widget.cpp
@@ -14,6 +14,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see .
+#include "stdpch.h"
#include "general_settings_widget.h"
#include "system.h"
#include
diff --git a/code/ryzom/tools/client/client_config_qt/main.cpp b/code/ryzom/tools/client/client_config_qt/main.cpp
index 758598e92..0f41c508b 100644
--- a/code/ryzom/tools/client/client_config_qt/main.cpp
+++ b/code/ryzom/tools/client/client_config_qt/main.cpp
@@ -14,7 +14,8 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see .
-#include
+#include "stdpch.h"
+
#include "client_config_dialog.h"
#include "system.h"
diff --git a/code/ryzom/tools/client/client_config_qt/sound_settings_widget.cpp b/code/ryzom/tools/client/client_config_qt/sound_settings_widget.cpp
index 5436ac2b4..39d82fe4f 100644
--- a/code/ryzom/tools/client/client_config_qt/sound_settings_widget.cpp
+++ b/code/ryzom/tools/client/client_config_qt/sound_settings_widget.cpp
@@ -14,6 +14,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see .
+#include "stdpch.h"
#include "sound_settings_widget.h"
#include "system.h"
diff --git a/code/ryzom/tools/client/client_config_qt/stdpch.cpp b/code/ryzom/tools/client/client_config_qt/stdpch.cpp
new file mode 100644
index 000000000..a3d45576c
--- /dev/null
+++ b/code/ryzom/tools/client/client_config_qt/stdpch.cpp
@@ -0,0 +1,17 @@
+// Ryzom - MMORPG Framework
+// Copyright (C) 2010 Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see .
+
+#include "stdpch.h"
diff --git a/code/ryzom/tools/client/client_config_qt/stdpch.h b/code/ryzom/tools/client/client_config_qt/stdpch.h
new file mode 100644
index 000000000..6f6655761
--- /dev/null
+++ b/code/ryzom/tools/client/client_config_qt/stdpch.h
@@ -0,0 +1,29 @@
+// Ryzom - MMORPG Framework
+// Copyright (C) 2010 Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see .
+
+#ifndef STDPCH_H
+#define STDPCH_H
+
+#include
+
+#include
+#include
+
+#include
+#include
+
+#endif
+
diff --git a/code/ryzom/tools/client/client_config_qt/sys_info_d3d_widget.cpp b/code/ryzom/tools/client/client_config_qt/sys_info_d3d_widget.cpp
index 894ea07ac..a97e5a1a7 100644
--- a/code/ryzom/tools/client/client_config_qt/sys_info_d3d_widget.cpp
+++ b/code/ryzom/tools/client/client_config_qt/sys_info_d3d_widget.cpp
@@ -14,6 +14,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see .
+#include "stdpch.h"
#include "sys_info_d3d_widget.h"
#include "system.h"
diff --git a/code/ryzom/tools/client/client_config_qt/sys_info_opengl_widget.cpp b/code/ryzom/tools/client/client_config_qt/sys_info_opengl_widget.cpp
index 0665025be..5d62a3bc3 100644
--- a/code/ryzom/tools/client/client_config_qt/sys_info_opengl_widget.cpp
+++ b/code/ryzom/tools/client/client_config_qt/sys_info_opengl_widget.cpp
@@ -14,6 +14,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see .
+#include "stdpch.h"
#include "sys_info_opengl_widget.h"
#include "system.h"
diff --git a/code/ryzom/tools/client/client_config_qt/sys_info_widget.cpp b/code/ryzom/tools/client/client_config_qt/sys_info_widget.cpp
index 26d52ddb8..8e34fa3cb 100644
--- a/code/ryzom/tools/client/client_config_qt/sys_info_widget.cpp
+++ b/code/ryzom/tools/client/client_config_qt/sys_info_widget.cpp
@@ -14,6 +14,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see .
+#include "stdpch.h"
#include "sys_info_widget.h"
#include "system.h"
diff --git a/code/ryzom/tools/client/client_config_qt/system.cpp b/code/ryzom/tools/client/client_config_qt/system.cpp
index c4c93f76d..b4596bdb8 100644
--- a/code/ryzom/tools/client/client_config_qt/system.cpp
+++ b/code/ryzom/tools/client/client_config_qt/system.cpp
@@ -14,6 +14,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see .
+#include "stdpch.h"
#include "system.h"
#include
#include