[Scummvm-git-logs] scummvm-tools master -> d4145d6d21c09bc497155e8e39c819129282c49b
csnover
csnover at users.noreply.github.com
Sun Dec 17 01:34:53 CET 2017
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .
Summary:
d0e63021d9 TOOLS: Fix win32dist when run from outside srcdir
d4145d6d21 TOOLS: Remove unnecessary mkdir calls
Commit: d0e63021d9ce293105bc8a2df080c2cbe1905b78
https://github.com/scummvm/scummvm-tools/commit/d0e63021d9ce293105bc8a2df080c2cbe1905b78
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-12-16T18:34:28-06:00
Commit Message:
TOOLS: Fix win32dist when run from outside srcdir
Changed paths:
Makefile
diff --git a/Makefile b/Makefile
index c7325df..e958238 100644
--- a/Makefile
+++ b/Makefile
@@ -86,15 +86,15 @@ scummvmtoolswinres.o: $(srcdir)/gui/media/scummvmtools.ico $(srcdir)/dists/scumm
$(QUIET_WINDRES)$(WINDRES) -DHAVE_CONFIG_H $(WINDRESFLAGS) $(DEFINES) -I. -I$(srcdir) $(srcdir)/dists/scummvmtools.rc scummvmtoolswinres.o
# Special target to create a win32 tools snapshot binary
-WIN32PATH=c:/scummvm
+WIN32PATH ?= build
win32dist: all
mkdir -p $(WIN32PATH)
mkdir -p $(WIN32PATH)/graphics
mkdir -p $(WIN32PATH)/tools
mkdir -p $(WIN32PATH)/tools/media
- cp gui/media/detaillogo.jpg $(WIN32PATH)/tools/media/
- cp gui/media/logo.jpg $(WIN32PATH)/tools/media/
- cp gui/media/tile.gif $(WIN32PATH)/tools/media/
+ cp $(srcdir)/gui/media/detaillogo.jpg $(WIN32PATH)/tools/media/
+ cp $(srcdir)/gui/media/logo.jpg $(WIN32PATH)/tools/media/
+ cp $(srcdir)/gui/media/tile.gif $(WIN32PATH)/tools/media/
$(STRIP) construct_mohawk$(EXEEXT) -o $(WIN32PATH)/tools/construct_mohawk$(EXEEXT)
ifeq "$(USE_FREETYPE)" "1"
ifeq "$(USE_ICONV)" "1"
@@ -116,13 +116,13 @@ ifeq "$(USE_WXWIDGETS)" "1"
$(STRIP) scummvm-tools$(EXEEXT) -o $(WIN32PATH)/tools/scummvm-tools$(EXEEXT)
endif
$(STRIP) scummvm-tools-cli$(EXEEXT) -o $(WIN32PATH)/tools/scummvm-tools-cli$(EXEEXT)
- cp *.bat $(WIN32PATH)/tools
- cp COPYING $(WIN32PATH)/tools/COPYING.txt
- cp README $(WIN32PATH)/tools/README.txt
- cp NEWS $(WIN32PATH)/tools/NEWS.txt
- cp dists/win32/graphics/left.bmp $(WIN32PATH)/graphics
- cp dists/win32/graphics/scummvm-install.ico $(WIN32PATH)/graphics
- cp dists/win32/ScummVM?Tools.iss $(WIN32PATH)
+ cp $(srcdir)/*.bat $(WIN32PATH)/tools
+ cp $(srcdir)/COPYING $(WIN32PATH)/tools/COPYING.txt
+ cp $(srcdir)/README $(WIN32PATH)/tools/README.txt
+ cp $(srcdir)/NEWS $(WIN32PATH)/tools/NEWS.txt
+ cp $(srcdir)/dists/win32/graphics/left.bmp $(WIN32PATH)/graphics
+ cp $(srcdir)/dists/win32/graphics/scummvm-install.ico $(WIN32PATH)/graphics
+ cp $(srcdir)/dists/win32/ScummVM?Tools.iss $(WIN32PATH)
unix2dos $(WIN32PATH)/tools/*.txt
# Special target to create a win32 NSIS installer
Commit: d4145d6d21c09bc497155e8e39c819129282c49b
https://github.com/scummvm/scummvm-tools/commit/d4145d6d21c09bc497155e8e39c819129282c49b
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-12-16T18:34:32-06:00
Commit Message:
TOOLS: Remove unnecessary mkdir calls
Changed paths:
Makefile
diff --git a/Makefile b/Makefile
index e958238..9e41c4c 100644
--- a/Makefile
+++ b/Makefile
@@ -88,9 +88,7 @@ scummvmtoolswinres.o: $(srcdir)/gui/media/scummvmtools.ico $(srcdir)/dists/scumm
# Special target to create a win32 tools snapshot binary
WIN32PATH ?= build
win32dist: all
- mkdir -p $(WIN32PATH)
mkdir -p $(WIN32PATH)/graphics
- mkdir -p $(WIN32PATH)/tools
mkdir -p $(WIN32PATH)/tools/media
cp $(srcdir)/gui/media/detaillogo.jpg $(WIN32PATH)/tools/media/
cp $(srcdir)/gui/media/logo.jpg $(WIN32PATH)/tools/media/
More information about the Scummvm-git-logs
mailing list