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

Fix to look for header libs relative to the $INCLUDE file

Browse source
This commit is contained in:
Samuel Gomes 2023-03-24 06:13:21 +05:30
parent 5bd3192491
commit 2b6b04e36c
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/qb64pe.bas
View file

@ -4472,7 +4472,11 @@ DO
GOTO GotHeader GOTO GotHeader
END IF END IF
' a740g: Fallback to source path ' a740g: Fallback to source path
libpath$ = FixDirectoryName(idepath$) + og_libpath$ IF inclevel > 0 THEN
libpath$ = getfilepath(incname(inclevel)) + og_libpath$
ELSE
libpath$ = FixDirectoryName(idepath$) + og_libpath$
END IF
libpath_inline$ = GetEscapedPath(libpath$) libpath_inline$ = GetEscapedPath(libpath$)
IF _FILEEXISTS(libpath$ + x$ + ".h") THEN IF _FILEEXISTS(libpath$ + x$ + ".h") THEN
headername$ = libpath_inline$ + x$ + ".h" headername$ = libpath_inline$ + x$ + ".h"
@ -4539,7 +4543,11 @@ DO
GOTO GotHeader GOTO GotHeader
END IF END IF
' a740g: Fallback to source path ' a740g: Fallback to source path
libpath$ = FixDirectoryName(idepath$) + og_libpath$ IF inclevel > 0 THEN
libpath$ = getfilepath(incname(inclevel)) + og_libpath$
ELSE
libpath$ = FixDirectoryName(idepath$) + og_libpath$
END IF
libpath_inline$ = GetEscapedPath(libpath$) libpath_inline$ = GetEscapedPath(libpath$)
IF _FILEEXISTS(libpath$ + x$ + ".h") THEN IF _FILEEXISTS(libpath$ + x$ + ".h") THEN
headername$ = libpath_inline$ + x$ + ".h" headername$ = libpath_inline$ + x$ + ".h"

2
source/utilities/file.bas
View file

@ -113,7 +113,7 @@ FUNCTION GetEscapedPath$ (path_name AS STRING)
GetEscapedPath = buf GetEscapedPath = buf
END FUNCTION END FUNCTION
' Adds a trailing \ or / if to the name if needed ' Adds a trailing \ or / to a directory name if needed
FUNCTION FixDirectoryName$ (dir_name AS STRING) FUNCTION FixDirectoryName$ (dir_name AS STRING)
IF LEN(dir_name) > 0 AND RIGHT$(dir_name, 1) <> pathsep$ THEN IF LEN(dir_name) > 0 AND RIGHT$(dir_name, 1) <> pathsep$ THEN
FixDirectoryName = dir_name + pathsep$ FixDirectoryName = dir_name + pathsep$