buildsystem/ide; makefile generation; fixed $(VER) to appear only when needed and...

diff --git a/crossplatform.mk b/crossplatform.mk
index be95764..55460e3 100644 (file)
--- a/crossplatform.mk
+++ b/crossplatform.mk
@@ -189,7 +189,7 @@ HOST_SO := $(if $(WINDOWS_HOST),.dll,$(if $(OSX_HOST),.dylib,.so))
 HOST_LP := $(if $(WINDOWS_HOST),$(if $(STATIC_LIBRARY_TARGET),lib,),lib)
 
 # VERSIONING
-VER := $(if $(VERSION),.$(VERSION),)
+VER := $(if $(WINDOWS_TARGET),,$(if $(VERSION),.$(VERSION),))
 
 # SUPER TOOLS
 ifdef CCACHE

diff --git a/ecere/ecereCOM.epj b/ecere/ecereCOM.epj
index 1e0aa66..aef0089 100644 (file)
--- a/ecere/ecereCOM.epj
+++ b/ecere/ecereCOM.epj
@@ -115,5 +115,6 @@
    "ResourcesPath" : "",
    "Resources" : [
 
-   ]
+   ],
+   "ModuleVersion" : "0.44"
 }

diff --git a/ide/src/project/Project.ec b/ide/src/project/Project.ec
index 4341971..16f9b73 100644 (file)
--- a/ide/src/project/Project.ec
+++ b/ide/src/project/Project.ec
@@ -2069,7 +2069,7 @@ private:
             strcat(fileName, "$(E)");
             break;
          case sharedLibrary:
-            strcat(fileName, "$(SO)");
+            strcat(fileName, "$(SO)$(VER)");
             break;
          case staticLibrary:
             strcat(fileName, "$(A)");
@@ -2476,7 +2476,7 @@ private:
             strcpy(targetNoSpaces, targetDir);
             PathCatSlash(targetNoSpaces, target);
             ReplaceSpaces(targetNoSpaces, targetNoSpaces);
-            f.Printf("TARGET = %s$(VER)\n", targetNoSpaces);
+            f.Printf("TARGET = %s\n", targetNoSpaces);
 
             if(test)
             {