- removed configurator from cmake file
- applied libircclient patch from forums 'the Chakra project'
This commit is contained in:
parent
22f43f4267
commit
cd5bce3b91
|
@ -43,7 +43,6 @@ ENDFUNCTION()
|
||||||
OPTION(BUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS "Build model import/export tools" ON)
|
OPTION(BUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS "Build model import/export tools" ON)
|
||||||
OPTION(BUILD_MEGAGLEST_MODEL_VIEWER "Build model viewer" ON)
|
OPTION(BUILD_MEGAGLEST_MODEL_VIEWER "Build model viewer" ON)
|
||||||
OPTION(BUILD_MEGAGLEST_MAP_EDITOR "Build map editor" ON)
|
OPTION(BUILD_MEGAGLEST_MAP_EDITOR "Build map editor" ON)
|
||||||
OPTION(BUILD_MEGAGLEST_CONFIGURATOR "Build configurator" ON)
|
|
||||||
OPTION(BUILD_MEGAGLEST "Build MegaGlest" ON)
|
OPTION(BUILD_MEGAGLEST "Build MegaGlest" ON)
|
||||||
|
|
||||||
FIND_PROGRAM(HELP2MAN "help2man")
|
FIND_PROGRAM(HELP2MAN "help2man")
|
||||||
|
@ -255,10 +254,9 @@ IF(EXISTS "${PROJECT_SOURCE_DIR}/source/")
|
||||||
#if(wxWidgets_FOUND)
|
#if(wxWidgets_FOUND)
|
||||||
ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/glest_map_editor )
|
ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/glest_map_editor )
|
||||||
ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/g3d_viewer )
|
ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/g3d_viewer )
|
||||||
ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/configurator )
|
|
||||||
#else()
|
#else()
|
||||||
# MESSAGE(STATUS "WARNING... the following game tools will NOT be built since we cannot find wxWidgets on this machine")
|
# MESSAGE(STATUS "WARNING... the following game tools will NOT be built since we cannot find wxWidgets on this machine")
|
||||||
# MESSAGE(STATUS "map editor, g3d viewer, configurator")
|
# MESSAGE(STATUS "map editor, g3d viewer")
|
||||||
#endif()
|
#endif()
|
||||||
ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/tools/glexemel )
|
ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/tools/glexemel )
|
||||||
|
|
||||||
|
|
|
@ -13,11 +13,11 @@
|
||||||
#include "ircclient.h"
|
#include "ircclient.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include "platform_common.h"
|
#include "platform_common.h"
|
||||||
#include "libircclient.h"
|
#include <libircclient.h>
|
||||||
|
|
||||||
// upstream moved some defines into new headers as of 1.6
|
// upstream moved some defines into new headers as of 1.6
|
||||||
#ifndef LIBIRCCLIENT_PRE1_6
|
#ifndef LIBIRCCLIENT_PRE1_6
|
||||||
#include "libirc_rfcnumeric.h"
|
#include <libirc_rfcnumeric.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
Loading…
Reference in New Issue