From 67284e2f9dbec52cd4f9a56d50616a2ecccf2230 Mon Sep 17 00:00:00 2001 From: eroen Date: Fri, 15 Nov 2013 15:59:38 +0100 Subject: [PATCH 1/4] Introduce -DBUILD_WITH_DPKG to toggle dpkg based install The current system automagically chooses between the dpkg-based install method (for debian-derived distributions) and a "traditional" install and sets install paths based on whether cmake can find a 'dpkg' executable. This is not ideal, since dpkg is occasionally installed on linux distributions unrelated to debian for purposes other than package management. In particular, Arch and Gentoo carry it in their repositories. --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b85fabf522..b4d1a9a808 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,10 @@ option(USE_MPG123 "use mpg123 + libsndfile for sound" ON) # OS X deployment option(OPENMW_OSX_DEPLOYMENT OFF) -find_program(DPKG_PROGRAM dpkg DOC "dpkg program of Debian-based systems") +option(BUILD_WITH_DPKG "enable dpkg-based install for debian and debian derivatives" OFF) +if(BUILD_WITH_DPKG) + find_program(DPKG_PROGRAM dpkg DOC "dpkg program of Debian-based systems") +endif(BUILD_WITH_DPKG) # Location of morrowind data files if (APPLE) From d4b8ac5b499b2a109503937b34861a2e77c44fdd Mon Sep 17 00:00:00 2001 From: eroen Date: Fri, 15 Nov 2013 16:53:05 +0100 Subject: [PATCH 2/4] don't dpkg on windows and macos No need to clutter windows and macos configuration with dpkg options, as it is unlikely to ever be useful. --- CMakeLists.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b4d1a9a808..d36898400a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,10 +50,12 @@ option(USE_MPG123 "use mpg123 + libsndfile for sound" ON) # OS X deployment option(OPENMW_OSX_DEPLOYMENT OFF) -option(BUILD_WITH_DPKG "enable dpkg-based install for debian and debian derivatives" OFF) -if(BUILD_WITH_DPKG) - find_program(DPKG_PROGRAM dpkg DOC "dpkg program of Debian-based systems") -endif(BUILD_WITH_DPKG) +if(UNIX AND NOT APPLE) + option(BUILD_WITH_DPKG "enable dpkg-based install for debian and debian derivatives" OFF) + if(BUILD_WITH_DPKG) + find_program(DPKG_PROGRAM dpkg DOC "dpkg program of Debian-based systems") + endif(BUILD_WITH_DPKG) +endif(UNIX AND NOT APPLE) # Location of morrowind data files if (APPLE) From b2d2a3dd178a9ebffeec9d1120d3f3aa3638b2a1 Mon Sep 17 00:00:00 2001 From: vorenon Date: Sat, 16 Nov 2013 19:15:47 +0000 Subject: [PATCH 3/4] Closing message boxes with numpad enter --- apps/openmw/mwinput/inputmanagerimp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp index 35487e3391..1c4ff161f1 100644 --- a/apps/openmw/mwinput/inputmanagerimp.cpp +++ b/apps/openmw/mwinput/inputmanagerimp.cpp @@ -503,7 +503,7 @@ namespace MWInput mInputBinder->keyPressed (arg); - if(arg.keysym.sym == SDLK_RETURN + if(arg.keysym.sym == SDLK_RETURN || arg.keysym.sym == SDLK_KP_ENTER && MWBase::Environment::get().getWindowManager()->isGuiMode()) { // Pressing enter when a messagebox is prompting for "ok" will activate the ok button From a19242b4ec0d718e019bc2f8a66a326379091053 Mon Sep 17 00:00:00 2001 From: Marc Zinnschlag Date: Sat, 16 Nov 2013 19:31:35 +0100 Subject: [PATCH 4/4] fixed expression in if statement --- apps/openmw/mwinput/inputmanagerimp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp index 1c4ff161f1..9b50be7cab 100644 --- a/apps/openmw/mwinput/inputmanagerimp.cpp +++ b/apps/openmw/mwinput/inputmanagerimp.cpp @@ -503,7 +503,7 @@ namespace MWInput mInputBinder->keyPressed (arg); - if(arg.keysym.sym == SDLK_RETURN || arg.keysym.sym == SDLK_KP_ENTER + if((arg.keysym.sym == SDLK_RETURN || arg.keysym.sym == SDLK_KP_ENTER) && MWBase::Environment::get().getWindowManager()->isGuiMode()) { // Pressing enter when a messagebox is prompting for "ok" will activate the ok button