GTK :
- Changed the config file location to follow the freedesktop.org XDG Base Directory Specification. There is no point to be compatible with the old location since we haven't made a release yet.
This commit is contained in:
parent
1892a3ebb6
commit
2af55d0f0b
|
@ -10,12 +10,6 @@ SET( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeScripts )
|
||||||
INCLUDE(CMakeScripts/CMakeDetermineASMCompiler.cmake)
|
INCLUDE(CMakeScripts/CMakeDetermineASMCompiler.cmake)
|
||||||
INCLUDE(CMakeScripts/CMakeASMInformation.cmake)
|
INCLUDE(CMakeScripts/CMakeASMInformation.cmake)
|
||||||
|
|
||||||
# Fill in SDLMAIN_LIBRARY on OS X manually to avoid using SDLMain.m
|
|
||||||
# OS X users will have to compile and install SDL form source.
|
|
||||||
if( APPLE )
|
|
||||||
SET(SDLMAIN_LIBRARY "-lSDLmain")
|
|
||||||
endif( APPLE )
|
|
||||||
|
|
||||||
# The project's name is VBA-M it uses assembly, C and C++ code
|
# The project's name is VBA-M it uses assembly, C and C++ code
|
||||||
PROJECT(VBA-M ASM C CXX)
|
PROJECT(VBA-M ASM C CXX)
|
||||||
|
|
||||||
|
@ -33,6 +27,12 @@ IF( NOT VERSION )
|
||||||
SET( VERSION "1.8.0-SVN" )
|
SET( VERSION "1.8.0-SVN" )
|
||||||
ENDIF( NOT VERSION )
|
ENDIF( NOT VERSION )
|
||||||
|
|
||||||
|
# Fill in SDLMAIN_LIBRARY on OS X manually to avoid using SDLMain.m
|
||||||
|
# OS X users will have to compile and install SDL form source.
|
||||||
|
if( APPLE )
|
||||||
|
SET(SDLMAIN_LIBRARY "-lSDLmain")
|
||||||
|
endif( APPLE )
|
||||||
|
|
||||||
# Look for some dependencies using builtin CMake scripts
|
# Look for some dependencies using builtin CMake scripts
|
||||||
FIND_PACKAGE ( ZLIB REQUIRED )
|
FIND_PACKAGE ( ZLIB REQUIRED )
|
||||||
FIND_PACKAGE ( PNG REQUIRED )
|
FIND_PACKAGE ( PNG REQUIRED )
|
||||||
|
|
|
@ -120,7 +120,7 @@ Window::Window(GtkWindow * _pstWindow, const Glib::RefPtr<Xml> & _poXml) :
|
||||||
|
|
||||||
// Get config
|
// Get config
|
||||||
//
|
//
|
||||||
m_sUserDataDir = Glib::get_home_dir() + "/.gvba";
|
m_sUserDataDir = Glib::get_user_config_dir() + "/gvbam";
|
||||||
m_sConfigFile = m_sUserDataDir + "/config";
|
m_sConfigFile = m_sUserDataDir + "/config";
|
||||||
|
|
||||||
vInitConfig();
|
vInitConfig();
|
||||||
|
|
Loading…
Reference in New Issue