diff options
author | nrootconauto <nrootconauto@gmail.com> | 2022-09-24 13:15:43 -0400 |
---|---|---|
committer | nrootconauto <nrootconauto@gmail.com> | 2022-09-24 13:15:43 -0400 |
commit | 95a22a4f0ca0cba71e51e58fc3b6f857fea4bb84 (patch) | |
tree | 81d7fffebbaeeee3dbf7f89aec2ca3935c780744 | |
parent | fe5bc34672f493efdd36bcde0e11a49fb91ae1ad (diff) |
Now will not check for template if t_drive is specified on the command line.v0.4.01
Signed-off-by: nrootconauto <nrootconauto@gmail.com>
-rw-r--r-- | debian/DEBIAN/control | 4 | ||||
-rw-r--r-- | main.c | 29 |
2 files changed, 17 insertions, 16 deletions
diff --git a/debian/DEBIAN/control b/debian/DEBIAN/control index c226862..7d87233 100644 --- a/debian/DEBIAN/control +++ b/debian/DEBIAN/control @@ -1,8 +1,8 @@ Package: 3days -Version: 0.4.00 +Version: 0.4.01 Section: development Priority: optional Architecture: amd64 -Depends: libxext-dev portaudio19-dev +Depends: libxext-dev,portaudio19-dev Maintainer: nrootconauto@gmail.com Description: A HolyC Compiler. @@ -113,6 +113,7 @@ int main(int argc,char **argv) } if(TDriveArg->count) { t_drive=strdup(TDriveArg->filename[0]); + VFsMountDrive('T',t_drive); } else { tmp=HostHomeDir(); t_drive=TD_MALLOC(1+1+strlen(tmp)+strlen(DFT_T_DRIVE)); @@ -123,22 +124,22 @@ int main(int argc,char **argv) #else strcat(t_drive,"/" DFT_T_DRIVE); #endif + #ifdef TARGET_WIN32 + char template[MAX_PATH]; + GetModuleFileNameA(NULL,template,sizeof(template)); + dirname(template); + strcat(template,DFT_TEMPLATE); + #endif + #ifndef TARGET_WIN32 + char *template=DFT_TEMPLATE; + #endif + //CreateTemplateBootDrv Checks if exists too + //DFT_TEMPLATE IS RELATIVE TO PROGRAM IN WINDOWS + CreateTemplateBootDrv(t_drive,template,OverwriteBootDrvArg->count); } + //IMPORTANT,init thread VFs after we make drive T + VFsThrdInit(); TOS_RegisterFuncPtrs(); - #ifdef TARGET_WIN32 - char template[MAX_PATH]; - GetModuleFileNameA(NULL,template,sizeof(template)); - dirname(template); - strcat(template,DFT_TEMPLATE); - #endif - #ifndef TARGET_WIN32 - char *template=DFT_TEMPLATE; - #endif - //CreateTemplateBootDrv Checks if exists too - //DFT_TEMPLATE IS RELATIVE TO PROGRAM IN WINDOWS - CreateTemplateBootDrv(t_drive,template,OverwriteBootDrvArg->count); - //IMPORTANT,init thread VFs after we make drive T - VFsThrdInit(); if(commandLineArg->count||sixty_fps->count) { char buf[1024]; vec_char_t boot_str; |