Fixed: PCH for Georges editor Qt

This commit is contained in:
kervala 2012-12-08 13:12:15 +01:00
parent 4a63d4556a
commit f89fdf3c24
3 changed files with 24 additions and 2 deletions

View file

@ -6,12 +6,24 @@
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# This tells the application(s) where to find the installed data. # This tells the application(s) where to find the installed data.
ADD_DEFINITIONS(-DDATA_DIR="\\"${RYZOM_SHARE_ABSOLUTE_PREFIX}/georges_editor_qt/\\"") IF(WIN32)
SET(GEQT_DATA_DIR ".")
ELSEIF(APPLE)
# TODO: under Mac OS X, don't install but copy files in application package
SET(GEQT_DATA_DIR ".")
ELSE(WIN32)
SET(GEQT_DATA_DIR ${RYZOM_SHARE_PREFIX}/georges_editor_qt/data)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/geqt_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/geqt_config.h)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
ADD_DEFINITIONS(-DHAVE_GEQT_CONFIG_H)
ENDIF(WIN32)
ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(src)
INSTALL(DIRECTORY data/ INSTALL(DIRECTORY data/
DESTINATION ${RYZOM_SHARE_PREFIX}/georges_editor_qt/data DESTINATION ${GEQT_DATA_DIR}
COMPONENT data COMPONENT data
PATTERN "CVS" EXCLUDE PATTERN "CVS" EXCLUDE
PATTERN ".svn" EXCLUDE PATTERN ".svn" EXCLUDE

View file

@ -0,0 +1,6 @@
#ifndef GEQT_CONFIG_H
#define GEQT_CONFIG_H
#define DATA_DIR "${RYZOM_SHARE_ABSOLUTE_PREFIX}/georges_editor_qt"
#endif

View file

@ -21,6 +21,10 @@
#include "modules.h" #include "modules.h"
#include "georges_splash.h" #include "georges_splash.h"
#ifdef HAVE_GEQT_CONFIG_H
#include "geqt_config.h"
#endif
// nel_qt log file name // nel_qt log file name
#define NLQT_LOG_FILE "nel_qt.log" #define NLQT_LOG_FILE "nel_qt.log"