From d5715530a6a5b39cf99e02f3d2e38f0bc068c19c Mon Sep 17 00:00:00 2001
From: mösi <mösi@b9310e46-f624-0410-8ea1-cfbb3a30dc96>
Date: Wed, 26 Nov 2008 20:32:13 +0000
Subject: Nachtrag zu r1246: neues make-build.bat, das die custom.ahk temporär
 umbenennt, und neues Top-level AHK-Skript
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.neo-layout.org@1247 b9310e46-f624-0410-8ea1-cfbb3a30dc96
---
 windows/neo-vars/src/make-build.bat | 12 ++++++++++++
 windows/neo-vars/src/neo20-all.ahk  | 19 ++++++++++++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/windows/neo-vars/src/make-build.bat b/windows/neo-vars/src/make-build.bat
index bbd2d46..1afffc3 100644
--- a/windows/neo-vars/src/make-build.bat
+++ b/windows/neo-vars/src/make-build.bat
@@ -17,6 +17,10 @@ set   ahkrevoutput1=%Ssrcdir%\_subwcrev1.generated.ahk
 set batrevtemplate1=%Ssrcdir%\_subwcrev1.tmpl.bat
 set   batrevoutput1=%Ssrcdir%\_subwcrev1.bat
 
+set     NEO2AppData=%APPDATA%\NEO2
+set       customahk=%NEO2AppData%\custom.ahk
+set  customahkbuild=%customahk%.buildtmp
+
 REM The path to the directory used for generating a consistent SVN version (revision number)
 set svnversiondir1=.
 
@@ -36,8 +40,16 @@ del "%outdir%\neo20-r*.exe" 2> nul
 
 set fnahk=%srcdir%\neo20-all.ahk
 
+if exist "%customahk%" (
+  ren "%customahk%" "%customahkbuild%"
+)
+
 echo Compiling the new Driver using Autohotkey
 "%Ahk2Exe%" /in "%fnahk%" /out "%fnexe%" /icon "%srcdir%\neo_enabled.ico"
 
+if exist "%customahkbuild%" (
+  ren "%customahkbuild%" "%customahk%"
+)
+
 echo Driver Update complete! You can now close this log-window.
 pause
diff --git a/windows/neo-vars/src/neo20-all.ahk b/windows/neo-vars/src/neo20-all.ahk
index 1c2c776..5a81983 100644
--- a/windows/neo-vars/src/neo20-all.ahk
+++ b/windows/neo-vars/src/neo20-all.ahk
@@ -22,12 +22,25 @@ SetWorkingDir, %A_ScriptDir%
 ; mehr gesetzt!
 #include    source\initialize.ahk
 #include    source\resources.ahk
+
+; Das Herz von neo20.ahk: die Tasten- und Zeichen-Behandlungsroutinen
+#include    source\varsfunctions.ahk
+
+; Die Bildschirmtastatur
+#include    source\screenkeyboard.ahk
+
+; Mitgelieferte Belegungsvarianten
+#include    source\langstastatur.ahk
+#include    source\einhandneo.ahk
+#include    source\lernmodus.ahk
+#include    source\tools.ahk
+
+; individuelle Einstellungen
+#include *i %A_AppData%\NEO2\custom.ahk
+
 #include    source\tray.ahk
 #include    source\keyhooks.ahk
 #include    source\trayfunctions.ahk
 #include    source\levelfunctions.ahk
 #include    source\keyboardleds.ahk
-#include    source\screenkeyboard.ahk
 
-; Das Herz von neo20.ahk: die Tasten- und Zeichen-Behandlungsroutinen
-#include    source\varsfunctions.ahk
-- 
cgit v1.2.3