Added support for LDFLAGS and config injection

Author: kala13x

src/cfg.c

@@ -448,6 +448,12 @@ int SMake_ParseConfig(smake_ctx_t *pCtx)
         pValueObj = XJSON_GetObject(pBuildObj, "compiler");
         if (pValueObj != NULL) xstrncpy(pCtx->sCompiler, sizeof(pCtx->sCompiler), XJSON_GetString(pValueObj));
 
+        pValueObj = XJSON_GetObject(pBuildObj, "inject");
+        if (pValueObj != NULL) xstrncpy(pCtx->sInjectPath, sizeof(pCtx->sInjectPath), XJSON_GetString(pValueObj));
+
+        pValueObj = XJSON_GetObject(pBuildObj, "ldflags");
+        if (pValueObj != NULL) xstrncpy(pCtx->sLDFlags, sizeof(pCtx->sLDFlags), XJSON_GetString(pValueObj));
+
         pValueObj = XJSON_GetObject(pBuildObj, "overwrite");
         if (pValueObj != NULL) pCtx->bOverwrite = XJSON_GetBool(pValueObj);
 
@@ -544,6 +550,8 @@ int SMake_WriteConfig(smake_ctx_t *pCtx)
             if (xstrused(pCtx->sName)) XJSON_AddObject(pBuildObj, XJSON_NewString(NULL, "name", pCtx->sName));
             if (xstrused(pCtx->sCompiler)) XJSON_AddObject(pBuildObj, XJSON_NewString(NULL, "compiler", pCtx->sCompiler));
             if (xstrused(pCtx->sOutDir)) XJSON_AddObject(pBuildObj, XJSON_NewString(NULL, "outputDir", pCtx->sOutDir));
+            if (xstrused(pCtx->sInjectPath)) XJSON_AddObject(pBuildObj, XJSON_NewString(NULL, "inject", pCtx->sInjectPath));
+            if (xstrused(pCtx->sLDFlags)) XJSON_AddObject(pBuildObj, XJSON_NewString(NULL, "ldflags", pCtx->sLDFlags));
 
             if (XArray_Used(&pCtx->flagArr))
             {

src/info.h

@@ -11,7 +11,7 @@
 
 #define SMAKE_VERSION_MAX     1
 #define SMAKE_VERSION_MIN     1
-#define SMAKE_BUILD_NUMBER    19
+#define SMAKE_BUILD_NUMBER    20
 
 #ifndef _SMAKE_VERSION_H_
 #define _SMAKE_VERSION_H_

src/make.c

@@ -61,9 +61,11 @@ void SMake_InitContext(smake_ctx_t *pCtx)
     pCtx->sPath[0] = pCtx->sOutDir[0] = '.';
     pCtx->sPath[1] = pCtx->sOutDir[1] = XSTR_NUL;
 
+    pCtx->sInjectPath[0] = XSTR_NUL;
     pCtx->sHeaderDst[0] = XSTR_NUL;
     pCtx->sBinaryDst[0] = XSTR_NUL;
     pCtx->sCompiler[0] = XSTR_NUL;
+    pCtx->sLDFlags[0] = XSTR_NUL;
     pCtx->sConfig[0] = XSTR_NUL;
     pCtx->sName[0] = XSTR_NUL;
     pCtx->sMain[0] = XSTR_NUL;
@@ -428,22 +430,36 @@ xbool_t SMake_WriteMake(smake_ctx_t *pCtx)
 
     xbool_t bLDLibs = xstrused(sLd);
     if (xstrused(sLd)) XFile_Print(&file, "LD_LIBS = %s\n", sLd);
+    XFile_Print(&file, "LDFLAGS =%s%s\n", xstrused(pCtx->sLDFlags) ? " " : "", pCtx->sLDFlags);
 
     XFile_Print(&file, "LIBS = %s\n", sLibs);
     XFile_Print(&file, "NAME = %s\n", pCtx->sName);
     XFile_Print(&file, "ODIR = %s\n", pCtx->sOutDir);
     XFile_Print(&file, "OBJ = o\n\n");
-    XFile_Print(&file, "OBJS = ");
+
+    if (xstrused(pCtx->sInjectPath) && XPath_Exists(pCtx->sInjectPath))
+    {
+        xbyte_buffer_t fileBuffer;
+        XPath_LoadBuffer(pCtx->sInjectPath, &fileBuffer);
+
+        if (fileBuffer.pData != NULL)
+        {
+            XFile_Print(&file, "%s\n\n", (char*)fileBuffer.pData);
+            XByteBuffer_Clear(&fileBuffer);
+        }
+    }
 
     xlogi("Compiler flags: %s %s", sFlags, sIncludes);
     xlogi("Linked libraries: %s", sLibs);
     xlogi("Custom libraries: %s", sLd);
     xlogi("Binary file name: %s", pCtx->sName);
     xlogi("Output Directory: %s", pCtx->sOutDir);
+    xlogi("Inject file: %s", xstrused(pCtx->sInjectPath) ? pCtx->sInjectPath : "None");
     xlogi("Compiler: %s", strlen(pCtx->sCompiler) ? pCtx->sCompiler : pCompiler);
 
     XArray_Sort(&pCtx->objArr, SMake_CompareName, NULL);
     size_t i, nObjs = XArray_Used(&pCtx->objArr);
+    XFile_Print(&file, "OBJS = ");
 
     for (i = 0; i < nObjs; i++)
     {
@@ -482,8 +498,8 @@ xbool_t SMake_WriteMake(smake_ctx_t *pCtx)
 
     if (bStatic) XFile_Print(&file, "\t$(AR) rcs $(ODIR)/$(NAME) $(OBJECTS)\n");
     else if (bShared) XFile_Print(&file, "\t$(%s) -shared -o $(ODIR)/$(NAME) $(OBJECTS)\n", pCompiler);
-    else if (!bLDLibs) XFile_Print(&file, "\t$(%s) $(%s) -o $(ODIR)/$(NAME) $(OBJECTS) $(LIBS)\n", pCompiler, pCFlags);
-    else XFile_Print(&file, "\t$(%s) $(%s) -o $(ODIR)/$(NAME) $(OBJECTS) $(LD_LIBS) $(LIBS)\n", pCompiler, pCFlags);
+    else if (!bLDLibs) XFile_Print(&file, "\t$(%s) $(%s) $(LDFLAGS) -o $(ODIR)/$(NAME) $(OBJECTS) $(LIBS)\n", pCompiler, pCFlags);
+    else XFile_Print(&file, "\t$(%s) $(%s) $(LDFLAGS) -o $(ODIR)/$(NAME) $(OBJECTS) $(LD_LIBS) $(LIBS)\n", pCompiler, pCFlags);
 
     if (bInstallBinary || bInstallIncludes)
     {

src/make.h

@@ -40,6 +40,8 @@ typedef struct SMakeContext {
     char sCompiler[SMAKE_NAME_MAX];
     char sHeaderDst[SMAKE_PATH_MAX];
     char sBinaryDst[SMAKE_PATH_MAX];
+    char sInjectPath[SMAKE_PATH_MAX];
+    char sLDFlags[SMAKE_LINE_MAX];
     char sOutDir[SMAKE_PATH_MAX];
     char sConfig[SMAKE_PATH_MAX];
     char sPath[SMAKE_PATH_MAX];