From c3a1a1cdfdf60dcb87ad3468acb19c18270b3857 Mon Sep 17 00:00:00 2001 From: Alex Yaroslavsky Date: Thu, 31 Aug 2017 15:59:46 +0000 Subject: [PATCH] correct build and nightly --- misc/nightly/plugins.common | 5 ----- plugins/luamacro/makefile_gcc | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/misc/nightly/plugins.common b/misc/nightly/plugins.common index a88c9f5cf3..e7aaef66f8 100644 --- a/misc/nightly/plugins.common +++ b/misc/nightly/plugins.common @@ -54,11 +54,6 @@ else cp -f $FILES ../../../outfinalnew${BIT}/Plugins/$PLUGIN/ || return 1 cd .. fi - -if [ ("$PLUGIN" == "luamacro") && ("$BIT" == "32") ]; then - mkdir -p ../../outfinalnew${BIT}/Legacy/ - cp -f luasdk/32/legacy/lua51.dll ../../outfinalnew${BIT}/Legacy/ || return 1 -fi } function bplugin { diff --git a/plugins/luamacro/makefile_gcc b/plugins/luamacro/makefile_gcc index 696a69c55d..d000fb1070 100644 --- a/plugins/luamacro/makefile_gcc +++ b/plugins/luamacro/makefile_gcc @@ -34,8 +34,8 @@ lualib: lualegacy: ifeq ($(DIRBIT),32) - @if not exist $(FAR_WORKDIR)\Legacy\$(NULL) $(MKDIR) $(FAR_WORKDIR)\Legacy - @$(CP) luasdk\32\legacy\lua51.dll $(FAR_WORKDIR)\Legacy 1>nul + @$(MKDIR) $(FAR_WORKDIR)/Legacy + @$(CP) luasdk/32/legacy/lua51.dll $(FAR_WORKDIR)/Legacy endif clean: