11#singleInstance force
22#persistent
33#noEnv
4- #include <threadMan>
4+ setWorkingDir ,% a_scriptDir
5+ #include data\threadMan.ahk
56menu ,tray ,tip ,ScriptUp
67
78; compiled installs
89if (a_isCompiled ){
9- fileInstall ,Lib\dlls\mini32.dll,Lib\dlls\mini32.dll
10- fileInstall ,Lib\dlls\mini64.dll,Lib\dlls\mini64.dll
11- fileInstall ,Lib\dlls\std32.dll,Lib\dlls\std32.dll
12- fileInstall ,Lib\dlls\std64.dll,Lib\dlls\std64.dll
13- fileInstall ,Lib\imgs\b1.png,Lib\imgs\b1.png
14- fileInstall ,Lib\imgs\b2.png,Lib\imgs\b2.png
15- fileInstall ,Lib\imgs\MXIII.png,Lib\imgs\MXIII.png
16- fileInstall ,Lib\workerH.ahk,Lib\workerH.ahk
10+ fileCreateDir ,data\dlls
11+ fileCreateDir ,data\imgs
12+ fileInstall ,data\dlls\mini32.dll,data\dlls\mini32.dll
13+ fileInstall ,data\dlls\mini64.dll,data\dlls\mini64.dll
14+ fileInstall ,data\dlls\std32.dll,data\dlls\std32.dll
15+ fileInstall ,data\dlls\std64.dll,data\dlls\std64.dll
16+ fileInstall ,data\imgs\b1.png,data\imgs\b1.png
17+ fileInstall ,data\imgs\b2.png,data\imgs\b2.png
18+ fileInstall ,data\imgs\MXIII.png,data\imgs\MXIII.png
19+ fileInstall ,data\workerH.ahk,data\workerH.ahk
1720}
1821
1922; setup config
2023; sini:=(siniD:=a_appData . "\..\Local\ScriptUp") . "\config.ini"
21- setWorkingDir ,% a_scriptDir
22- sini:=a_scriptDir . " \Lib\config.ini"
23- dlls:=a_scriptDir . " \Lib\dlls"
24- imgs:=a_scriptDir . " \Lib\imgs"
24+ sini:=a_scriptDir . " \data\config.ini"
25+ dlls:=a_scriptDir . " \data\dlls"
26+ imgs:=a_scriptDir . " \data\imgs"
2527workerdll:=dlls . " \std" . (a_ptrSize * 8 ) . " .dll"
26- workerfile:=a_scriptDir . " \Lib \workerH.ahk"
28+ workerfile:=a_scriptDir . " \data \workerH.ahk"
2729fileLastDir:=a_scriptDir
2830if (! fileExist (sini))
2931 firstRun:=1
@@ -36,7 +38,7 @@ if(!errorLevel) ; auto-correct if the script has been moved
3638 regWrite ,REG_SZ ,% regStartupPath,ScriptUp,% a_scriptFullPath
3739
3840; start worker
39- #include < guiMake>
41+ #include data\ guiMake.ahk
4042worker:=new threadMan(workerdll)
4143worker.newFromFile(workerfile)
4244onExit ,cleanup
@@ -52,9 +54,10 @@ if(firstRun){
5254setTimer ,checkStates,1000
5355return
5456
55- #include <guiSubs>
56- #include <optionSubs>
57- #include <menuSubs>
57+ #include data\guiSubs.ahk
58+ #include data\optionSubs.ahk
59+ #include data\menuSubs.ahk
60+ #include data\functions.ahk
5861
5962checkStates :
6063stateList:=worker.varGet(" stateList" )
0 commit comments