aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-09-23 13:10:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge from default

Browse source
This commit is contained in:
Krolock 2012-01-15 22:22:20 +01:00
parent a29cdabfb5
commit be751a5340
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/attrib_widget.h
View file

@ -58,7 +58,7 @@ public:
/// Force to update dialog content /// Force to update dialog content
void updateUi(); void updateUi();
/// Сonnects all the slots with signals /// Connects all the slots with signals
void init(); void init();
/// Sets the pointer CWorkspaceNode* in the wrappers. /// Sets the pointer CWorkspaceNode* in the wrappers.
@ -192,6 +192,7 @@ protected:
QDialog *_SchemeWidget; QDialog *_SchemeWidget;
Ui::CAttribWidget _ui; Ui::CAttribWidget _ui;
friend class CSchemeBankDialog;
}; /* class CAttribWidget */ }; /* class CAttribWidget */
/** /**

6
code/ryzom/tools/client/client_patcher/CMakeLists.txt
View file

@ -1,4 +1,5 @@
FILE(GLOB SRC main.cpp FILE(GLOB SRC main.cpp
${CMAKE_SOURCE_DIR}/ryzom/client/src/app_bundle_utils.cpp
${CMAKE_SOURCE_DIR}/ryzom/client/src/client_cfg.cpp ${CMAKE_SOURCE_DIR}/ryzom/client/src/client_cfg.cpp
${CMAKE_SOURCE_DIR}/ryzom/client/src/login_patch.cpp ${CMAKE_SOURCE_DIR}/ryzom/client/src/login_patch.cpp
${CMAKE_SOURCE_DIR}/ryzom/client/src/login_xdelta.cpp ${CMAKE_SOURCE_DIR}/ryzom/client/src/login_xdelta.cpp
@ -21,6 +22,11 @@ TARGET_LINK_LIBRARIES(ryzom_client_patcher
ryzom_sevenzip ryzom_sevenzip
${CURL_LIBRARIES}) ${CURL_LIBRARIES})
IF(APPLE)
FIND_LIBRARY(FOUNDATION_LIBRARY Foundation)
TARGET_LINK_LIBRARIES(ryzom_client_patcher ${FOUNDATION_LIBRARY})
ENDIF(APPLE)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${CURL_DEFINITIONS} -DRZ_NO_CLIENT -DNL_USE_SEVENZIP) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${CURL_DEFINITIONS} -DRZ_NO_CLIENT -DNL_USE_SEVENZIP)
NL_DEFAULT_PROPS(ryzom_client_patcher "Ryzom, Tools: Ryzom Client Patcher") NL_DEFAULT_PROPS(ryzom_client_patcher "Ryzom, Tools: Ryzom Client Patcher")