Изменения, связанные с поддержкой машин без SSE2 (частично).

FarGroup · Aug 30, 2017 · aad9d21 · aad9d21
1 parent 75438bc
commit aad9d21
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/plugins/luamacro/makefile_gcc b/plugins/luamacro/makefile_gcc
@@ -25,13 +25,19 @@ include ../makefile_gcc_def_inc
 SKIPCLEAN = 1
 include ../makefile_gcc_target_inc
 
-$(DLLFULLNAME): lualib
+$(DLLFULLNAME): lualib lualegacy
 
-.PHONY: lualib clean
+.PHONY: lualib lualegacy clean
 
 lualib:
 	@$(MAKE) -f makefile_lib_gcc $(MK_FLAGS) DLLDIR=$(FAR_WORKDIR) LUAVER=$(LUAVER)
 
+ifeq ($(DIRBIT),32)
+lualegacy:
+	@if not exist $(FAR_WORKDIR)\Legacy\$(NULL) $(MKDIR) $(FAR_WORKDIR)\Legacy
+	@$(CP) luasdk\32\legacy\lua51.dll $(FAR_WORKDIR)\Legacy
+endif
+
 clean:
 	@$(RM) $(OBJS) $(DEPS) $(DLLDIR)/*
 	@$(MAKE) -f makefile_lib_gcc $(MK_FLAGS) DLLDIR=$(FAR_WORKDIR) clean
diff --git a/plugins/luamacro/makefile_vc b/plugins/luamacro/makefile_vc
@@ -29,7 +29,7 @@ DOCS=_globalinfo.lua api.lua luamacro.lua macrotest.lua utils.lua \
 
 !include ..\makefile_vc_def_inc
 
-$(DLLFULLNAME) : lualib
+$(DLLFULLNAME) : lualib lualegacy
 
 LINK_OBJS = $(OBJDIR)\luaplug.obj
 
@@ -47,9 +47,15 @@ LIBS=$(LIBS) luasdk\$(DIRBIT)\lua$(LUA_VER).lib $(LUALIB)
 	@$(CC) $(CPPFLAGS) /Fo$(OBJDIR)\ { $< } 
 !endif
 
-.PHONY: lualib
+.PHONY: lualib lualegacy
 
 !include ../makefile_vc_getmode
 
 lualib:
 	@$(MAKE) $(_MKHIDE) /f makefile_lib_vc INSTALL=$(FAR_WORKDIR) $(_MDEFS)
+
+!if "$(DIRBIT)" == "32"
+lualegacy:
+	if not exist $(FAR_WORKDIR)\Legacy\$(NULL) mkdir $(FAR_WORKDIR)\Legacy
+	copy /y luasdk\32\legacy\lua51.dll $(FAR_WORKDIR)\Legacy
+!endif