QB64/QB64-PE
QB64/QB64-PE
1
1
Fork 0
mirror of https://github.com/QB64-Phoenix-Edition/QB64pe.git synced 2024-07-05 20:30:24 +00:00
Code Issues Releases Wiki Activity

Fix for relative paths (./ or .\) in LIBRARY declarations.

Browse source 
These were having issues when compiling via command line.
This commit is contained in:
FellippeHeitor 2016-06-30 03:58:20 -03:00
parent b175c3f3b4
commit aec3d3b4dd
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
source/qb64.bas
View file

@ -196,7 +196,7 @@ NEXT
DIM SHARED extension AS STRING DIM SHARED extension AS STRING
DIM SHARED path.exe$ DIM SHARED path.exe$, path.source$
extension$ = ".exe" extension$ = ".exe"
IF os$ = "LNX" THEN extension$ = "" 'no extension under Linux IF os$ = "LNX" THEN extension$ = "" 'no extension under Linux
@ -1157,21 +1157,22 @@ sourcefile$ = f$
f$ = RemoveFileExtension$(f$) f$ = RemoveFileExtension$(f$)
path.exe$ = "" path.exe$ = ""
IF SaveExeWithSource THEN currentdir$ = _CWD$
currentdir$ = _CWD$ path.source$ = getfilepath$(sourcefile$)
path.exe$ = getfilepath$(sourcefile$) IF LEN(path.source$) THEN
IF LEN(path.exe$) THEN IF _DIREXISTS(path.source$) = 0 THEN
IF _DIREXISTS(path.exe$) = 0 THEN PRINT
PRINT PRINT "CANNOT LOCATE SOURCE FILE:" + sourcefile$
PRINT "CANNOT LOCATE SOURCE FILE:" + sourcefile$ IF ConsoleMode THEN SYSTEM 1
IF ConsoleMode THEN SYSTEM 1 END 1
END 1
END IF
CHDIR path.exe$
path.exe$ = _CWD$
CHDIR currentdir$
IF RIGHT$(path.exe$, 1) <> pathsep$ THEN path.exe$ = path.exe$ + pathsep$
END IF END IF
CHDIR path.source$
path.source$ = _CWD$
CHDIR currentdir$
END IF
IF SaveExeWithSource THEN
path.exe$ = path.source$
IF RIGHT$(path.exe$, 1) <> pathsep$ THEN path.exe$ = path.exe$ + pathsep$
END IF END IF
IF path.exe$ = "" THEN IF path.exe$ = "" THEN
IF INSTR(_OS$, "WIN") THEN path.exe$ = "..\..\" ELSE path.exe$ = "../../" IF INSTR(_OS$, "WIN") THEN path.exe$ = "..\..\" ELSE path.exe$ = "../../"
@ -3720,7 +3721,8 @@ DO
IF libpath$ = "./" OR libpath$ = ".\" THEN IF libpath$ = "./" OR libpath$ = ".\" THEN
libpath$ = "" libpath$ = ""
IF NoIDEMode THEN IF NoIDEMode THEN
IF LEFT$(path.exe$, 2) <> ".." THEN libpath$ = path.exe$ libpath$ = path.source$
IF LEN(libpath$) > 0 AND RIGHT$(libpath$, 1) <> pathsep$ THEN libpath$ = libpath$ + pathsep$
ELSE ELSE
IF LEN(ideprogname) THEN libpath$ = idepath$ + pathsep$ IF LEN(ideprogname) THEN libpath$ = idepath$ + pathsep$
END IF END IF