ide: Fixed VERSION to only be applied on linux host & platform

diff --git a/crossplatform.mk b/crossplatform.mk
index 55460e3..0794d87 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 $(WINDOWS_TARGET),,$(if $(VERSION),.$(VERSION),))
+VER := $(if $(LINUX_TARGET),$(if $(LINUX_HOST),$(if $(VERSION),.$(VERSION),),),)
 
 # SUPER TOOLS
 ifdef CCACHE

diff --git a/ide/src/project/Project.ec b/ide/src/project/Project.ec
index 16f9b73..6faa488 100644 (file)
--- a/ide/src/project/Project.ec
+++ b/ide/src/project/Project.ec
@@ -1228,7 +1228,7 @@ private:
                strcat(string, ".dylib");
             else
                strcat(string, ".so");
-            if(compiler.targetPlatform != win32 && moduleVersion && moduleVersion[0])
+            if(compiler.targetPlatform == tux && GetRuntimePlatform() == tux && moduleVersion && moduleVersion[0])
             {
                strcat(string, ".");
                strcat(string, moduleVersion);
@@ -2876,11 +2876,13 @@ private:
          f.Puts("endif\n");
          f.Puts("ifdef SHARED_LIBRARY_TARGET\n");
          f.Puts("ifdef LINUX_TARGET\n");
+         f.Puts("ifdef LINUX_HOST\n");
          // TODO?: support symlinks for longer version numbers
          f.Puts("\t$(if $(basename $(VER)),ln -sf $(LP)$(MODULE)$(SO)$(VER) $(OBJ)$(LP)$(MODULE)$(SO)$(basename $(VER)),)\n");
          f.Puts("\t$(if $(VER),ln -sf $(LP)$(MODULE)$(SO)$(VER) $(OBJ)$(LP)$(MODULE)$(SO),)\n");
          f.Puts("endif\n");
          f.Puts("endif\n");
+         f.Puts("endif\n");
 
          //f.Puts("# POST-BUILD COMMANDS\n");
          if(options && options.postbuildCommands)
@@ -2954,11 +2956,13 @@ private:
          f.Puts("\t$(call rmq,$(TARGET))\n");
          f.Puts("ifdef SHARED_LIBRARY_TARGET\n");
          f.Puts("ifdef LINUX_TARGET\n");
+         f.Puts("ifdef LINUX_HOST\n");
          // TODO?: support symlinks for longer version numbers
          f.Puts("\t$(call rmq,$(OBJ)$(LP)$(MODULE)$(SO)$(basename $(VER)))\n");
          f.Puts("\t$(call rmq,$(OBJ)$(LP)$(MODULE)$(SO))\n");
          f.Puts("endif\n");
          f.Puts("endif\n");
+         f.Puts("endif\n");
          f.Puts("\n");
 
          f.Puts("clean: cleantarget\n");