Update CVS to pre2 release version.
Updated make release to create an opengl binary, and a nongl binary. configure should create static binaries now.
This commit is contained in:
parent
8c01b019c8
commit
92b918aa77
3 changed files with 24 additions and 3 deletions
23
Makefile
23
Makefile
|
@ -151,7 +151,11 @@ distclean: clean
|
|||
|
||||
configure:
|
||||
autoconf
|
||||
./configure
|
||||
./configure --enable-static
|
||||
|
||||
configuregl:
|
||||
autoconf
|
||||
./configure --enable-opengl
|
||||
|
||||
lockver:
|
||||
$(LOCKVER) Makefile $(RULESFILE) .indent.pro \
|
||||
|
@ -243,6 +247,20 @@ bin-dist: all
|
|||
$(RM) $(DISTLIST)
|
||||
$(RM) -r $(distdir)
|
||||
|
||||
bin-dist-gl: all
|
||||
$(RM) $(DISTLIST)
|
||||
echo $(DOCS) >>$(DISTLIST)
|
||||
echo stratagus$(EXE) >>$(DISTLIST)
|
||||
rm -rf $(distdir)
|
||||
mkdir $(distdir)
|
||||
chmod 777 $(distdir)
|
||||
for i in `cat $(DISTLIST)`; do echo $$i; done | cpio -pdml --quiet $(distdir)
|
||||
chmod -R a+rX $(distdir)
|
||||
strip -s -R .comment $(distdir)/stratagus$(EXE)
|
||||
tar czhf stratagus-$(mydate)-linux-gl.tar.gz $(distdir)
|
||||
$(RM) $(DISTLIST)
|
||||
$(RM) -r $(distdir)
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
win32-bin-dist2: win32
|
||||
|
@ -281,6 +299,9 @@ release:
|
|||
$(MAKE) configure
|
||||
$(MAKE) depend
|
||||
$(MAKE) bin-dist
|
||||
$(MAKE) configuregl
|
||||
$(MAKE) depend
|
||||
$(MAKE) bin-dist-gl
|
||||
$(MAKE) win32new
|
||||
$(MAKE) win32configure
|
||||
$(MAKE) win32-bin-dist
|
||||
|
|
|
@ -29,7 +29,7 @@ VIDEO_CFLAGS = @VIDEO_CFLAGS@
|
|||
COMP_CFLAGS = -DUSE_ZLIB @BZ2_CFLAGS@
|
||||
COMP_LIBS = -lz @BZ2_LIBS@
|
||||
|
||||
VERSION= '-DVERSION="2.1pre1"'
|
||||
VERSION= '-DVERSION="2.1pre2"'
|
||||
|
||||
TOOLLIBS=$(XLDFLAGS) -lpng -lz -lm @EXTRA_LIBS@ @THREAD_LIBS@ -L/usr/local/lib \
|
||||
@STATIC_LDFLAGS@
|
||||
|
|
|
@ -167,7 +167,7 @@ typedef struct _missile_type_ MissileType;
|
|||
----------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef VERSION
|
||||
#define VERSION "2.1pre1" ///< Engine version shown
|
||||
#define VERSION "V(Unknown)" ///< Engine version shown
|
||||
#endif
|
||||
|
||||
#ifndef StratagusMajorVerion
|
||||
|
|
Loading…
Reference in a new issue