From 0627d1f093db4064c114e8fb2a2a8e824fb606bb Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Tue, 10 Dec 2019 12:51:30 -0500 Subject: Configuration++ --- spm.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'spm.h') diff --git a/spm.h b/spm.h index e7b9d4b..d8540a4 100644 --- a/spm.h +++ b/spm.h @@ -14,6 +14,9 @@ #include #include #include +#if !defined(_WIN32) +#include +#endif #include "config.h" @@ -29,7 +32,8 @@ #define NOT_DIRSEP DIRSEP_WIN32 #endif -#define PKG_DIR "../pkgs" +#define PKG_DIR SPM_GLOBAL.package_dir +#define TMP_DIR SPM_GLOBAL.tmp_dir #define SHELL_DEFAULT 1 << 0 #define SHELL_OUTPUT 1 << 1 @@ -41,12 +45,12 @@ typedef struct { } ConfigItem; typedef struct { - char *platform; - char *arch; char *package_dir; + char *tmp_dir; char *user_config_basedir; char *user_config_file; ConfigItem **config; + struct utsname sysinfo; } spm_vars; static spm_vars SPM_GLOBAL; -- cgit