diff options
| -rw-r--r-- | make/include/tool.defs | 1 | ||||
| -rw-r--r-- | pkg/mingw/module.defs | 2 | ||||
| -rw-r--r-- | pkg/mingw/module.rules | 11 |
3 files changed, 7 insertions, 7 deletions
diff --git a/make/include/tool.defs b/make/include/tool.defs index 9a5d109fe..19f1a3fee 100644 --- a/make/include/tool.defs +++ b/make/include/tool.defs @@ -9,3 +9,4 @@ TAR.exe = tar TOUCH.exe = touch WGET.exe = wget MV.exe = mv +ZIP.exe = zip diff --git a/pkg/mingw/module.defs b/pkg/mingw/module.defs index f71e24e67..054a4d0d7 100644 --- a/pkg/mingw/module.defs +++ b/pkg/mingw/module.defs @@ -1,6 +1,6 @@ PKG.cli.zip = $(PKG.out/)$(HB.name)-$(HB.version)-Win_CLI.zip
-PKG.cli.tmp.zip = $(PKG.out/)$(HB.name)-$(HB.version)-Win_CLI.tmp.zip
+PKG.mingw.lib = $(SRC/)libraries
STAGE.out.cli/ = $(STAGE.out/)cli/
diff --git a/pkg/mingw/module.rules b/pkg/mingw/module.rules index 8d075595d..efef0b4b8 100644 --- a/pkg/mingw/module.rules +++ b/pkg/mingw/module.rules @@ -1,15 +1,14 @@ -pkg.create:: $(PKG.cli.zip)
+pkg.create.zip:: pkg.create $(PKG.cli.zip)
$(PKG.cli.zip): | $(dir $(PKG.cli.zip))
$(PKG.cli.zip): | $(STAGE.out.cli/)
- $(STAGE.out.cli/)
-
+ cd $(STAGE.out.cli/) && $(ZIP.exe) -r $(call fn.ABSOLUTE,$(PKG.cli.zip)) .
$(STAGE.out.cli/):
- $(MKDIR.exe) -p $@
- $(CP.exe) HandBrakeCLI.exe ./stage/cli
- $(CP.exe) ../libraries/libgcc_s_sjlj-1.dll ./stage/cli
+ -$(MKDIR.exe) -p $@
+ $(CP.exe) HandBrakeCLI.exe $(STAGE.out.cli/)
+ $(CP.exe) $(PKG.mingw.lib)/libgcc_s_sjlj-1.dll $(STAGE.out.cli/)
$(call STAGE.doc,$(STAGE.out.cli/))
|