Fixed make strip in Makefile
In build-win32-cross.sh strip stratagus.exe and compress with upx
This commit is contained in:
parent
a0ec4a5375
commit
153aaffb9a
4 changed files with 20 additions and 2 deletions
3
Makefile
3
Makefile
|
@ -105,8 +105,7 @@ stratagus: $(OBJ)
|
|||
$(CXX) -o $(OUTFILE) $^ $(CXXFLAGS) $(LDFLAGS)
|
||||
|
||||
strip:
|
||||
@if [ -f $(OUTFILE) ]; then strip $(OUTFILE); fi
|
||||
@if [ -f $(OUTFILE).exe ]; then $(CROSSDIR)/i386-mingw32msvc/bin/strip $(OUTFILE).exe; fi
|
||||
@if [ -f $(OUTFILE) ]; then $(STRIP) $(OUTFILE); fi
|
||||
|
||||
src/$(OBJDIR)/stratagusrc.o: src/stratagus.rc
|
||||
if [ ! -d src/$(OBJDIR) ]; then mkdir src/$(OBJDIR); fi
|
||||
|
|
|
@ -14,6 +14,7 @@ CXX=@CXX@
|
|||
RM=rm -f
|
||||
MAKE=make
|
||||
WINDRES=@WINDRES@
|
||||
STRIP=@STRIP@
|
||||
|
||||
# Prefix for 'make install'
|
||||
PREFIX=@PREFIX@
|
||||
|
|
|
@ -4,11 +4,15 @@ make distclean || exit 1
|
|||
./autogen.sh || exit 1
|
||||
./configure --enable-win32 --host=amd64-mingw32msvc --prefix=/usr/amd64-mingw32msvc --enable-static --without-bzip2 --disable-stdio-redirect || exit 1
|
||||
make || exit 1
|
||||
make strip || exit 1
|
||||
#upx -9 stratagus.exe || exit 1
|
||||
makensis -DAMD64 stratagus.nsi || exit 1
|
||||
|
||||
make distclean || exit 1
|
||||
./autogen.sh || exit 1
|
||||
./configure --enable-win32 --host=i586-mingw32msvc --prefix=/usr/i586-mingw32msvc --enable-static --without-bzip2 --disable-stdio-redirect || exit 1
|
||||
make || exit 1
|
||||
make strip || exit 1
|
||||
upx -9 stratagus.exe || exit 1
|
||||
makensis stratagus.nsi || exit 1
|
||||
|
||||
|
|
14
configure.in
14
configure.in
|
@ -311,6 +311,19 @@ else
|
|||
WINDRES=""
|
||||
fi
|
||||
|
||||
if test "$STRIP" == ""; then
|
||||
STRIP="$host-strip";
|
||||
fi
|
||||
AC_CHECK_PROGS(STRIP_CHECK, $STRIP)
|
||||
if test "x$STRIP_CHECK" = "x"; then
|
||||
STRIP="strip"
|
||||
AC_CHECK_PROGS(STRIP_CHECK, $STRIP)
|
||||
fi
|
||||
if test "x$STRIP_CHECK" = "x"; then
|
||||
echo "*** strip not found"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
OUTFILE=stratagus
|
||||
if test "$ARCH" = "win32"; then
|
||||
OUTFILE=stratagus.exe
|
||||
|
@ -319,6 +332,7 @@ fi
|
|||
AC_SUBST(OUTFILE)
|
||||
|
||||
AC_SUBST(WINDRES)
|
||||
AC_SUBST(STRIP)
|
||||
AC_SUBST(CPPFLAGS)
|
||||
AC_SUBST(CXXFLAGS)
|
||||
AC_SUBST(LDFLAGS)
|
||||
|
|
Loading…
Add table
Reference in a new issue