mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-10 09:19:01 +00:00
Created NELGUI library, moved the GUI event descriptors there.
This commit is contained in:
parent
e6f5bdef0b
commit
c976419448
12 changed files with 33 additions and 7 deletions
|
@ -274,6 +274,7 @@ MACRO(NL_SETUP_NEL_DEFAULT_OPTIONS)
|
|||
###
|
||||
OPTION(WITH_NET "Build NLNET" ON )
|
||||
OPTION(WITH_3D "Build NL3D" ON )
|
||||
OPTION(WITH_GUI "Build GUI" ON )
|
||||
OPTION(WITH_PACS "Build NLPACS" ON )
|
||||
OPTION(WITH_GEORGES "Build NLGEORGES" ON )
|
||||
OPTION(WITH_LIGO "Build NLLIGO" ON )
|
||||
|
|
|
@ -4,6 +4,10 @@ IF(WITH_3D)
|
|||
SUBDIRS(3d)
|
||||
ENDIF(WITH_3D)
|
||||
|
||||
IF(WITH_GUI)
|
||||
ADD_SUBDIRECTORY(gui)
|
||||
ENDIF(WITH_GUI)
|
||||
|
||||
IF(WITH_GEORGES)
|
||||
SUBDIRS(georges)
|
||||
ENDIF(WITH_GEORGES)
|
||||
|
|
3
code/nel/include/nel/gui/CMakeLists.txt
Normal file
3
code/nel/include/nel/gui/CMakeLists.txt
Normal file
|
@ -0,0 +1,3 @@
|
|||
FILE(GLOB HEADERS *.h)
|
||||
|
||||
INSTALL(FILES ${HEADERS} DESTINATION include/nel/gui COMPONENT headers)
|
|
@ -4,6 +4,10 @@ IF(WITH_3D)
|
|||
ADD_SUBDIRECTORY(3d)
|
||||
ENDIF(WITH_3D)
|
||||
|
||||
IF(WITH_GUI)
|
||||
ADD_SUBDIRECTORY(gui)
|
||||
ENDIF(WITH_GUI)
|
||||
|
||||
IF(WITH_GEORGES)
|
||||
ADD_SUBDIRECTORY(georges)
|
||||
ENDIF(WITH_GEORGES)
|
||||
|
|
14
code/nel/src/gui/CMakeLists.txt
Normal file
14
code/nel/src/gui/CMakeLists.txt
Normal file
|
@ -0,0 +1,14 @@
|
|||
FILE(GLOB SRC *.cpp *.h)
|
||||
FILE(GLOB HEADERS ../../include/nel/gui/*.h)
|
||||
|
||||
NL_TARGET_LIB(nelgui ${HEADERS} ${SRC})
|
||||
|
||||
SET_TARGET_PROPERTIES(nelgui PROPERTIES LINK_INTERFACE_LIBRARIES "")
|
||||
NL_DEFAULT_PROPS(nelgui "NeL, Library: NeL GUI")
|
||||
NL_ADD_RUNTIME_FLAGS(nelgui)
|
||||
|
||||
NL_ADD_LIB_SUFFIX(nelgui)
|
||||
|
||||
IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
|
||||
INSTALL(TARGETS nelgui LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
|
||||
ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
|
|
@ -16,9 +16,8 @@
|
|||
|
||||
|
||||
|
||||
#include "stdpch.h"
|
||||
|
||||
#include "event_descriptor.h"
|
||||
#include "nel/misc/events.h"
|
||||
#include "nel/gui/event_descriptor.h"
|
||||
|
||||
void CEventDescriptorKey::init(const NLMISC::CEventKey &ev)
|
||||
{
|
|
@ -81,6 +81,7 @@ TARGET_LINK_LIBRARIES(ryzom_client
|
|||
nelligo
|
||||
nelgeorges
|
||||
nel3d
|
||||
nelgui
|
||||
nelsound
|
||||
ryzom_clientsheets
|
||||
ryzom_gameshare
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#include "nel/misc/types_nl.h"
|
||||
#include "view_base.h"
|
||||
#include "event_descriptor.h"
|
||||
#include "nel/gui/event_descriptor.h"
|
||||
|
||||
class CCtrlBase : public CViewBase
|
||||
{
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include <vector>
|
||||
#include <map>
|
||||
#include <string>
|
||||
#include "event_descriptor.h"
|
||||
#include "nel/gui/event_descriptor.h"
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
@ -54,7 +54,7 @@
|
|||
#include "../entities.h"
|
||||
#include "../events_listener.h"
|
||||
#include "../interface_v3/group_list.h"
|
||||
#include "../interface_v3/event_descriptor.h"
|
||||
#include "nel/gui/event_descriptor.h"
|
||||
#include "../interface_v3/group_tree.h"
|
||||
#include "../client_cfg.h"
|
||||
#include "../interface_v3/lua_ihm.h"
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include "r2_config.h"
|
||||
//
|
||||
#include "../interface_v3/interface_manager.h"
|
||||
#include "../interface_v3/event_descriptor.h"
|
||||
#include "nel/gui/event_descriptor.h"
|
||||
#include "../motion/user_controls.h"
|
||||
#include "../global.h"
|
||||
#include "../entities.h"
|
||||
|
|
Loading…
Reference in a new issue