Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merged in hotfix (pull request #109)

Browse source 
Merge hotfix branch
This commit is contained in:
dfighter1985 2015-02-06 00:46:23 +01:00
commit b754c91fef
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/CMakeLists.txt
View file

@ -237,6 +237,7 @@ SET(CPACK_PACKAGE_VERSION_MINOR "${NL_VERSION_MINOR}")
SET(CPACK_PACKAGE_VERSION_PATCH "${NL_VERSION_PATCH}") SET(CPACK_PACKAGE_VERSION_PATCH "${NL_VERSION_PATCH}")
SET(CPACK_INSTALL_CMAKE_PROJECTS "${CMAKE_BINARY_DIR};NeL;ALL;/") SET(CPACK_INSTALL_CMAKE_PROJECTS "${CMAKE_BINARY_DIR};NeL;ALL;/")
SET(CPACK_PACKAGE_EXECUTABLES "ryzomcore${NL_VERSION}" "ryzomcore") SET(CPACK_PACKAGE_EXECUTABLES "ryzomcore${NL_VERSION}" "ryzomcore")
SET(CPACK_SET_DESTDIR TRUE)
# NSIS Specific Packing Setup # NSIS Specific Packing Setup
SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "RyzomCore") SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "RyzomCore")

3
code/studio/src/settings_dialog.cpp
View file

@ -170,7 +170,8 @@ void SettingsDialog::onPrimitivesBClicked()
void SettingsDialog::onLigoBClicked() void SettingsDialog::onLigoBClicked()
{ {
QString p = QFileDialog::getExistingDirectory( this, tr( "LIGO directory" ), "" ); QString p;
p = QFileDialog::getOpenFileName( this, tr( "LIGO config file" ), "" );
ligoLE->setText( p ); ligoLE->setText( p );
} }