Finished LDFLAGS support

Author: kala13x

src/cfg.c

@@ -451,7 +451,7 @@ int SMake_ParseConfig(smake_ctx_t *pCtx)
         pValueObj = XJSON_GetObject(pBuildObj, "inject");
         if (pValueObj != NULL) xstrncpy(pCtx->sInjectPath, sizeof(pCtx->sInjectPath), XJSON_GetString(pValueObj));
 
-        pValueObj = XJSON_GetObject(pBuildObj, "ldflags");
+        pValueObj = XJSON_GetObject(pBuildObj, "ldFlags");
         if (pValueObj != NULL) xstrncpy(pCtx->sLDFlags, sizeof(pCtx->sLDFlags), XJSON_GetString(pValueObj));
 
         pValueObj = XJSON_GetObject(pBuildObj, "overwrite");
@@ -551,7 +551,7 @@ int SMake_WriteConfig(smake_ctx_t *pCtx)
             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 (xstrused(pCtx->sLDFlags)) XJSON_AddObject(pBuildObj, XJSON_NewString(NULL, "ldFlags", pCtx->sLDFlags));
 
             if (XArray_Used(&pCtx->flagArr))
             {

src/make.c

@@ -430,7 +430,7 @@ 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);
+    if (xstrused(pCtx->sLDFlags)) XFile_Print(&file, "LDFLAGS = %s\n", pCtx->sLDFlags);
 
     XFile_Print(&file, "LIBS = %s\n", sLibs);
     XFile_Print(&file, "NAME = %s\n", pCtx->sName);
@@ -496,10 +496,19 @@ xbool_t SMake_WriteMake(smake_ctx_t *pCtx)
     XFile_Print(&file, "\t$(%s) $(%s)%s -c -o $(ODIR)/$@ $< $(LIBS)\n\n", pCompiler, pCFlags, pFPICOption);
     XFile_Print(&file, "$(NAME):$(OBJS)\n");
 
+    
     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) $(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);
+    else if (xstrused(pCtx->sLDFlags))
+    {
+        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);
+    }
+    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);
+    }
 
     if (bInstallBinary || bInstallIncludes)
     {