Changed: Reorganize Ryzom Configuration structure

This commit is contained in:
kervala 2016-09-21 09:50:59 +02:00
parent f134dc812b
commit d307b5ad87
39 changed files with 21 additions and 45 deletions

View file

@ -1,36 +1,13 @@
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${NEL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${NEL_INCLUDE_DIR})
FILE(GLOB SRC *.cpp *.h resources/*.rc) FILE(GLOB SRC src/*.cpp src/*.h resources/*.rc)
SET(CLIENT_CONFIG_HDR
client_config_dialog.h
display_settings_advanced_widget.h
display_settings_details_widget.h
display_settings_widget.h
general_settings_widget.h
sound_settings_widget.h
sys_info_d3d_widget.h
sys_info_opengl_widget.h
sys_info_widget.h
widget_base.h
)
SET(CLIENT_CONFIG_UIS
client_config_dialog.ui
display_settings_advanced_widget.ui
display_settings_details_widget.ui
display_settings_widget.ui
general_settings_widget.ui
sound_settings_widget.ui
sys_info_d3d_widget.ui
sys_info_opengl_widget.ui
sys_info_widget.ui
)
FILE(GLOB CLIENT_CONFIG_HDR src/*.h)
FILE(GLOB CLIENT_CONFIG_UIS ui/*.ui)
FILE(GLOB CLIENT_CONFIG_TRANS translations/*.ts) FILE(GLOB CLIENT_CONFIG_TRANS translations/*.ts)
CONFIGURE_FILE(translations/translations.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc COPYONLY) 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(CLIENT_CONFIG_RCS resources/resources.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc )
IF(WITH_QT) IF(WITH_QT)
INCLUDE_DIRECTORIES(${QT_INCLUDES}) INCLUDE_DIRECTORIES(${QT_INCLUDES})
@ -44,7 +21,7 @@ IF(WITH_QT)
ADD_DEFINITIONS(${QT_DEFINITIONS}) ADD_DEFINITIONS(${QT_DEFINITIONS})
ELSE() ELSE()
# uncomment this line if you want to update original translations # uncomment this line if you want to update original translations
# QT5_CREATE_TRANSLATION(CLIENT_CONFIG_QM ${CLIENT_CONFIG_UIS} ${SRC} ${CLIENT_CONFIG_TRANS}) # QT5_CREATE_TRANSLATION(CLIENT_CONFIG_QM ${CLIENT_CONFIG_UIS} ${SRC} ${CLIENT_CONFIG_TRANS} OPTIONS -I ${CMAKE_CURRENT_SOURCE_DIR})
QT5_ADD_TRANSLATION(CLIENT_CONFIG_QM ${CLIENT_CONFIG_TRANS}) QT5_ADD_TRANSLATION(CLIENT_CONFIG_QM ${CLIENT_CONFIG_TRANS})
QT5_ADD_RESOURCES(CLIENT_CONFIG_RC_SRCS ${CLIENT_CONFIG_RCS}) QT5_ADD_RESOURCES(CLIENT_CONFIG_RC_SRCS ${CLIENT_CONFIG_RCS})
QT5_WRAP_CPP(CLIENT_CONFIG_MOC_SRC ${CLIENT_CONFIG_HDR}) QT5_WRAP_CPP(CLIENT_CONFIG_MOC_SRC ${CLIENT_CONFIG_HDR})

View file

@ -1,16 +0,0 @@
<RCC>
<qresource prefix="/">
<file>resources/card_icon.png</file>
<file>resources/display_config_icon.png</file>
<file>resources/display_icon.png</file>
<file>resources/display_properties_icon.png</file>
<file>resources/general_icon.png</file>
<file>resources/left_bitmap_0.png</file>
<file>resources/network_icon.png</file>
<file>resources/sound_icon.png</file>
<file>resources/splash_screen.png</file>
<file>resources/top_right.png</file>
<file>resources/update_icon.png</file>
<file>resources/welcome_icon.png</file>
</qresource>
</RCC>

View file

@ -0,0 +1,16 @@
<RCC>
<qresource prefix="/resources">
<file>card_icon.png</file>
<file>display_config_icon.png</file>
<file>display_icon.png</file>
<file>display_properties_icon.png</file>
<file>general_icon.png</file>
<file>left_bitmap_0.png</file>
<file>network_icon.png</file>
<file>sound_icon.png</file>
<file>splash_screen.png</file>
<file>top_right.png</file>
<file>update_icon.png</file>
<file>welcome_icon.png</file>
</qresource>
</RCC>

View file

@ -1,7 +1,6 @@
<RCC> <RCC>
<qresource prefix="/translations"> <qresource prefix="/translations">
<file>ryzom_configuration_de.qm</file> <file>ryzom_configuration_de.qm</file>
<file>ryzom_configuration_en.qm</file>
<file>ryzom_configuration_es.qm</file> <file>ryzom_configuration_es.qm</file>
<file>ryzom_configuration_fr.qm</file> <file>ryzom_configuration_fr.qm</file>
<file>ryzom_configuration_hu.qm</file> <file>ryzom_configuration_hu.qm</file>