From fdf2df2f0fcdd324c94c978e02058108af1c6e7a Mon Sep 17 00:00:00 2001 From: hiker Date: Thu, 28 Apr 2016 13:59:21 +1000 Subject: [PATCH] Also search for directories with the name 'build' for the editor (not only bld), which is the documented name to use for the editor. --- tools/windows_installer/supertuxkart.nsi | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/windows_installer/supertuxkart.nsi b/tools/windows_installer/supertuxkart.nsi index 344c61e9d..b2f50bd10 100755 --- a/tools/windows_installer/supertuxkart.nsi +++ b/tools/windows_installer/supertuxkart.nsi @@ -153,12 +153,20 @@ Section "Main Section" SecMain File ${EXEC_PATH} + ; Check various options for the editor. Note that us devs mostly use 'bld', + ; but documented is the name 'build' ${!setIfUndefinedAndExists} EDITOR_PATH ..\..\..\editor\bld\RelWithDebInfo ${!setIfUndefinedAndExists} EDITOR_PATH ..\..\..\editor\bld\Release ${!setIfUndefinedAndExists} EDITOR_PATH ..\..\..\stk-editor\bld\RelWithDebInfo ${!setIfUndefinedAndExists} EDITOR_PATH ..\..\..\stk-editor\bld\Release ${!setIfUndefinedAndExists} EDITOR_PATH ..\..\..\supertuxkart-editor\bld\RelWithDebInfo ${!setIfUndefinedAndExists} EDITOR_PATH ..\..\..\supertuxkart-editor\bld\Release + ${!setIfUndefinedAndExists} EDITOR_PATH ..\..\..\editor\build\RelWithDebInfo + ${!setIfUndefinedAndExists} EDITOR_PATH ..\..\..\editor\build\Release + ${!setIfUndefinedAndExists} EDITOR_PATH ..\..\..\stk-editor\build\RelWithDebInfo + ${!setIfUndefinedAndExists} EDITOR_PATH ..\..\..\stk-editor\build\Release + ${!setIfUndefinedAndExists} EDITOR_PATH ..\..\..\supertuxkart-editor\build\RelWithDebInfo + ${!setIfUndefinedAndExists} EDITOR_PATH ..\..\..\supertuxkart-editor\build\Release !ifdef EDITOR_PATH File ${EDITOR_PATH}\supertuxkart-editor.exe ${EDITOR_PATH}\supertuxkart-editor.pdb