/*****************************************************************************/
/* */
-/* incpath.c */
+/* incpath.c */
/* */
-/* Include path handling for the ca65 macro assembler */
+/* Include path handling for the ca65 macro assembler */
/* */
/* */
/* */
-/* (C) 2000-2009, Ullrich von Bassewitz */
+/* (C) 2000-2013, Ullrich von Bassewitz */
/* Roemerstrasse 52 */
/* D-70794 Filderstadt */
/* EMail: uz@cc65.org */
-/* common */
-#include "searchpath.h"
-
/* ca65 */
#include "incpath.h"
/*****************************************************************************/
-/* Data */
+/* Data */
/*****************************************************************************/
-#define INC_STD 0x0001U
+SearchPaths* IncSearchPath; /* Standard include path */
+SearchPaths* BinSearchPath; /* Binary include path */
/*****************************************************************************/
-/* Code */
+/* Code */
/*****************************************************************************/
-void AddIncludePath (const char* NewPath)
-/* Add a new include path to the existing one */
+void InitIncludePaths (void)
+/* Initialize the include path search list */
{
- AddSearchPath (NewPath, INC_STD);
+ /* Create the search path lists */
+ IncSearchPath = NewSearchPath ();
+ BinSearchPath = NewSearchPath ();
}
-char* FindInclude (const char* Name)
-/* Find an include file. Return a pointer to a malloced area that contains
- * the complete path, if found, return 0 otherwise.
- */
+void FinishIncludePaths (void)
+/* Finish creating the include path search list. */
{
- /* Search in the include directories */
- return SearchFile (Name, INC_STD);
-}
-
+ /* Add specific paths from the environment */
+ AddSearchPathFromEnv (IncSearchPath, "CA65_INC");
+ /* Add paths relative to a main directory defined in an env. var. */
+ AddSubSearchPathFromEnv (IncSearchPath, "CC65_HOME", "asminc");
-void InitIncludePaths (void)
-/* Initialize the include path search list */
-{
- /* Add some standard paths to the include search path */
- AddSearchPath ("", INC_STD); /* Current directory */
-
- /* Add some compiled in search paths if defined at compile time */
-#ifdef CA65_INC
- AddSearchPath (CA65_INC, INC_STD);
+ /* Add some compiled-in search paths if defined at compile time. */
+#if defined(CA65_INC) && !defined(_WIN32)
+ AddSearchPath (IncSearchPath, STRINGIZE (CA65_INC));
#endif
- /* Add specific paths from the environment */
- AddSearchPathFromEnv ("CA65_INC", INC_STD);
-
- /* Add paths relative to a main directory defined in an env var */
- AddSubSearchPathFromEnv ("CC65_HOME", "asminc", INC_STD);
+ /* Add paths relative to the parent directory of the Windows binary. */
+ AddSubSearchPathFromWinBin (IncSearchPath, "asminc");
}
-
-
-