Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Boost raw Makefiles 

- Use PACKAGE, PACKAGE_VERSION, remove VERSION
- Allow out-of-source-dir builds (mkdir build && cd build && make -f ../Makefile.raw)
- Move config.mk from $(top_srcdir)/makerules/config.mk to $(top_builddir)/config.mk
   When keeping current behaviour (srcdir=builddir), this means: Move it from makerules into the main directory


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5308 4a71c877-e1ca-e34f-864e-861f7616d084
master
Dennis Schridde 2008-06-23 13:54:47 +00:00
parent aa2c897bd2
commit 9bd8b24921
30 changed files with 326 additions and 272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile.raw
View File

@ -1,10 +1,18 @@
SUBDIRS=build_tools po win32 lib src data pkg SUBDIRS=build_tools po win32 lib src data pkg
all clean: $(SUBDIRS) # Figure out top source dir: The Makefile.raw will be in it, and it is relative to this directory
build_path:=$(patsubst %/Makefile.raw,%,$(lastword $(MAKEFILE_LIST)))
ifneq ($(strip $(build_path)),Makefile.raw)
export top_srcdir:=$(CURDIR)/$(build_path)
else
export top_srcdir:=$(CURDIR)
endif
.PHONY: $(SUBDIRS) # Top build dir is this directory
$(SUBDIRS): export top_builddir:=$(CURDIR)
$(MAKE) -f Makefile.raw -C $@ $(MAKECMDGOALS)
src: win32 lib build_tools include $(top_srcdir)/makerules/configure.mk
packaging: data src po include $(top_srcdir)/makerules/submake.mk
src: build_tools win32 lib
pkg: data src po

9
build_tools/Makefile.raw
View File

@ -1,8 +1,5 @@
include $(top_srcdir)/makerules/configure.mk
SUBDIRS=autorevision SUBDIRS=autorevision
all clean: $(SUBDIRS) include $(top_srcdir)/makerules/submake.mk
$(SUBDIRS):
$(MAKE) -f Makefile.raw -C $@ $(MAKECMDGOALS)
.PHONY: all clean $(SUBDIRS)

31
build_tools/autorevision/Makefile.raw
View File

@ -1,26 +1,29 @@
MAKERULES=../../makerules include $(top_srcdir)/makerules/configure.mk
include $(MAKERULES)/configure.mk
include $(MAKERULES)/common.mk # Hacks to build for compiling system, not for target
CC:=g++
CXX:=g++
CPPFLAGS:=$(subst -DWIN32,,$(CPPFLAGS))
CFLAGS:=$(subst -mwindows,,$(CFLAGS))
CXXFLAGS:=$(subst -mwindows,,$(CXXFLAGS))
LDFLAGS:=
EXEEXT=
SRC=autorevision.cpp SRC=autorevision.cpp
EXE=autorevision EXE=autorevision
CXX=g++
DEPS=$(patsubst %.c,%.o, $(SRC:%.cpp=%.o)) $(LIBS) include $(top_srcdir)/makerules/exe.mk
.PHONY: all all-local clean clean-local
all: all-local all: all-local
$(EXE)$(EXEEXT): $(DEPS)
$(CXX) -o $@ $<
all-local: $(EXE)$(EXEEXT) all-local: $(EXE)$(EXEEXT)
$(EXE)$(EXEEXT) +cstr -v ../.. ../../src/autorevision.h $(builddir)$(DIRSEP)$(EXE)$(EXEEXT) +cstr -v $(top_srcdir) $(top_builddir)/src/autorevision.h
clean-local: clean-local:
-$(RMF) ../../src/autorevision.h -$(RM_F) $(top_builddir)/src/autorevision.h
clean: clean: clean-local
$(RMF) $(DEPS) $(EXE)$(EXEEXT) $(RM_F) $(DEPS) $(EXE)$(EXEEXT)
.PHONY: all all-local clean

40
data/Makefile.raw
View File

@ -1,35 +1,41 @@
include $(top_srcdir)/makerules/configure.mk
SUBDIRS=mods SUBDIRS=mods
MAKERULES=../makerules BASELIST=anims audio components effects features tagdefinitions \
include $(MAKERULES)/configure.mk gamedesc.lev images messages misc multiplay music novideo.rpl script \
sequenceaudio stats stats-sql structs texpages wrf
BASELIST = anims audio components effects features tagdefinitions \ PATCHLIST=addon.lev anims components effects \
gamedesc.lev images messages misc multiplay novideo.rpl \
script sequenceaudio stats stats-sql structs texpages wrf
PATCHLIST = addon.lev anims components effects \
messages multiplay stats structs wrf messages multiplay stats structs wrf
BASEARCHIVE=base.wz BASEARCHIVE=base.wz
PATCHARCHIVE=mp.wz PATCHARCHIVE=mp.wz
CLEANFILES=$(BASEARCHIVE) $(PATCHARCHIVE)
include $(top_srcdir)/makerules/submake.mk
.PHONY: all clean $(BASEARCHIVE) $(PATCHARCHIVE) $(SUBDIRS)
all: all:
ifdef DATA ifdef DATA
all: $(BASEARCHIVE) $(PATCHARCHIVE) $(SUBDIRS) all: $(BASEARCHIVE) $(PATCHARCHIVE) $(SUBDIRS)
endif endif
$(SUBDIRS): stamp:
$(MAKE) -f Makefile.raw -C $@ $(MAKECMDGOALS) touch stamp
$(BASEARCHIVE): $(BASELIST:%=base/%) $(BASEARCHIVE): $(srcdir)/$(basename $(BASEARCHIVE)) stamp $(patsubst %,$(srcdir)/$(basename $(BASEARCHIVE))/%,$(BASELIST))
cd base && zip -ru0 $@ $(BASELIST) -x *svn* (cd $< && zip -ru0 $(builddir)/$@ $(filter-out stamp,$(filter-out $<,$(^:$</%=%))) -x '*svn*' || [ $$? -eq 12 ] && true) # zip returns 12 on "nothing to do"
zip -T $@ zip -T $@
$(RM_F) stamp
$(PATCHARCHIVE): $(PATCHLIST:%=mp/%) $(PATCHARCHIVE): $(srcdir)/$(basename $(BASEARCHIVE)) stamp $(patsubst %,$(srcdir)/$(basename $(PATCHARCHIVE))/%,$(PATCHLIST))
cd mp && zip -ru0 ../$@ $(PATCHLIST) -x *svn* (cd $< && zip -ru0 $(builddir)/$@ $(filter-out stamp,$(filter-out $<,$(^:$</%=%))) -x '*svn*' || [ $$? -eq 12 ] && true) # zip returns 12 on "nothing to do"
zip -T $@ zip -T $@
$(RM_F) stamp
clean: $(SUBDIRS) clean: $(SUBDIRS)
$(RMF) $(BASEARCHIVE) $(RMDIR) $(SUBDIRS)
$(RMF) $(PATCHARCHIVE) $(RM_F) $(BASEARCHIVE)
$(RM_F) $(PATCHARCHIVE)
.PHONY: all clean $(SUBDIRS) $(BASEARCHIVE) $(PATCHARCHIVE)

9
data/mods/Makefile.raw
View File

@ -1,8 +1,5 @@
include $(top_srcdir)/makerules/configure.mk
SUBDIRS=global SUBDIRS=global
all clean: $(SUBDIRS) include $(top_srcdir)/makerules/submake.mk
$(SUBDIRS):
$(MAKE) -f Makefile.raw -C $@ $(MAKECMDGOALS)
.PHONY: all clean $(SUBDIRS)

50
data/mods/global/Makefile.raw
View File

@ -1,41 +1,49 @@
MAKERULES=../../../makerules include $(top_srcdir)/makerules/configure.mk
include $(MAKERULES)/configure.mk
AIVOLUTIONLIST = multiplay commands.txt AIVOLUTIONLIST=multiplay commands.txt
GRIMLIST = components structs texpages wrf COPYING GRIMLIST=components structs texpages wrf COPYING
NEWST_TILESLIST = texpages COPYING readme.txt NEWST_TILESLIST=texpages COPYING readme.txt
NTWLIST = addon.lev audio components COPYING doc effects images messages multiplay stats structs texpages wrf NTWLIST=addon.lev audio components COPYING doc effects images messages multiplay stats structs texpages wrf
AIVOLUTIONARCHIVE=aivolution.wz AIVOLUTIONARCHIVE=aivolution.wz
GRIMARCHIVE=grim.wz GRIMARCHIVE=grim.wz
NEWST_TILESARCHIVE=newst_tiles.wz NEWST_TILESARCHIVE=newst_tiles.wz
NTWARCHIVE=ntw.wz NTWARCHIVE=ntw.wz
CLEANFILES=$(AIVOLUTIONARCHIVE) $(GRIMARCHIVE) $(NEWST_TILESARCHIVE) $(NTWARCHIVE)
.PHONY: all clean $(AIVOLUTIONARCHIVE) $(GRIMARCHIVE) $(NEWST_TILESARCHIVE) $(NTWARCHIVE)
all: all:
ifdef DATA ifdef DATA
all: $(AIVOLUTIONARCHIVE) $(GRIMARCHIVE) $(NEWST_TILESARCHIVE) $(NTWARCHIVE) all: $(AIVOLUTIONARCHIVE) $(GRIMARCHIVE) $(NEWST_TILESARCHIVE) $(NTWARCHIVE)
endif endif
$(AIVOLUTIONARCHIVE): $(AIVOLUTIONLIST:%=aivolution/%) stamp:
cd aivolution && zip -ru0 ../$@ $(AIVOLUTIONLIST) -x *svn* touch stamp
zip -T $@
$(GRIMARCHIVE): $(GRIMLIST:%=grim/%) $(AIVOLUTIONARCHIVE): $(srcdir)/$(basename $(AIVOLUTIONARCHIVE)) stamp $(patsubst %,$(srcdir)/$(basename $(AIVOLUTIONARCHIVE))/%,$(AIVOLUTIONLIST))
cd grim && zip -ru0 ../$@ $(GRIMLIST) -x *svn* (cd $< && zip -ru0 $(builddir)/$@ $(filter-out stamp,$(filter-out $<,$(^:$</%=%))) -x '*svn*' || [ $$? -eq 12 ] && true) # zip returns 12 on "nothing to do"
zip -T $@ zip -T $@
$(RM_F) stamp
$(NEWST_TILESARCHIVE): $(NEWST_TILESLIST:%=newst_tiles/%) $(GRIMARCHIVE): $(srcdir)/$(basename $(GRIMARCHIVE)) stamp $(patsubst %,$(srcdir)/$(basename $(GRIMARCHIVE))/%,$(GRIMLIST))
cd newst_tiles && zip -ru0 ../$@ $(NEWST_TILESLIST) -x *svn* (cd $< && zip -ru0 $(builddir)/$@ $(filter-out stamp,$(filter-out $<,$(^:$</%=%))) -x '*svn*' || [ $$? -eq 12 ] && true) # zip returns 12 on "nothing to do"
zip -T $@ zip -T $@
$(RM_F) stamp
$(NTWARCHIVE): $(NTWLIST:%=ntw/%) $(NEWST_TILESARCHIVE): $(srcdir)/$(basename $(NEWST_TILESARCHIVE)) stamp $(patsubst %,$(srcdir)/$(basename $(NEWST_TILESARCHIVE))/%,$(NEWST_TILESLIST))
cd ntw && zip -ru0 ../$@ $(NTWLIST) -x *svn* (cd $< && zip -ru0 $(builddir)/$@ $(filter-out stamp,$(filter-out $<,$(^:$</%=%))) -x '*svn*' || [ $$? -eq 12 ] && true) # zip returns 12 on "nothing to do"
zip -T $@ zip -T $@
$(RM_F) stamp
$(NTWARCHIVE): $(srcdir)/$(basename $(NTWARCHIVE)) stamp $(patsubst %,$(srcdir)/$(basename $(NTWARCHIVE))/%,$(NTWLIST))
(cd $< && zip -ru0 $(builddir)/$@ $(filter-out stamp,$(filter-out $<,$(^:$</%=%))) -x '*svn*' || [ $$? -eq 12 ] && true) # zip returns 12 on "nothing to do"
zip -T $@
$(RM_F) stamp
clean: clean:
$(RMF) $(GRIMARCHIVE) $(RM_F) $(GRIMARCHIVE)
$(RMF) $(AIVOLUTIONARCHIVE) $(RM_F) $(AIVOLUTIONARCHIVE)
$(RMF) $(NEWST_TILESARCHIVE) $(RM_F) $(NEWST_TILESARCHIVE)
$(RMF) $(NTWARCHIVE) $(RM_F) $(NTWARCHIVE)
.PHONY: all clean $(AIVOLUTIONARCHIVE) $(GRIMARCHIVE) $(NEWST_TILESARCHIVE) $(NTWARCHIVE)

18
lib/Makefile.raw
View File

@ -1,3 +1,5 @@
include $(top_srcdir)/makerules/configure.mk
SUBDIRS=framework \ SUBDIRS=framework \
exceptionhandler \ exceptionhandler \
gamelib \ gamelib \
@ -10,18 +12,4 @@ SUBDIRS=framework \
sqlite3 \ sqlite3 \
widget widget
.PHONY: $(SUBDIRS) include $(top_srcdir)/makerules/submake.mk
all clean: $(SUBDIRS)
$(SUBDIRS):
$(MAKE) -f Makefile.raw -C $@ $(MAKECMDGOALS)
# Dependencies not needed, since no linking done?
#gamelib: framework ivis_common ivis_opengl sound
#ivis_common: framework gamelib
#ivis_opengl: framework ivis_common gamelib
#netplay: framework
#script: framework
#sequence: framework
#sound: framework gamelib
#widget: framework ivis_common

5
lib/exceptionhandler/Makefile.raw
View File

@ -1,5 +1,4 @@
MAKERULES=../../makerules include $(top_srcdir)/makerules/configure.mk
include $(MAKERULES)/configure.mk
SRC=dumpinfo.cpp \ SRC=dumpinfo.cpp \
exceptionhandler.c \ exceptionhandler.c \
@ -7,4 +6,4 @@ SRC=dumpinfo.cpp \
LIB=exceptionhandler LIB=exceptionhandler
include $(MAKERULES)/lib.mk include $(top_srcdir)/makerules/lib.mk

7
lib/framework/Makefile.raw
View File

@ -1,5 +1,4 @@
MAKERULES=../../makerules include $(top_srcdir)/makerules/configure.mk
include $(MAKERULES)/configure.mk
SRC=configfile.c \ SRC=configfile.c \
cursors.c \ cursors.c \
@ -25,4 +24,6 @@ SRC=configfile.c \
LIB=framework LIB=framework
include $(MAKERULES)/lib.mk CLEANFILES=strres_parser.tab.h resource_parser.tab.h
include $(top_srcdir)/makerules/lib.mk

7
lib/gamelib/Makefile.raw
View File

@ -1,5 +1,4 @@
MAKERULES=../../makerules include $(top_srcdir)/makerules/configure.mk
include $(MAKERULES)/configure.mk
SRC=anim.c \ SRC=anim.c \
animobj.c \ animobj.c \
@ -10,4 +9,6 @@ SRC=anim.c \
LIB=gamelib LIB=gamelib
include $(MAKERULES)/lib.mk CLEANFILES=audp_parser.tab.h
include $(top_srcdir)/makerules/lib.mk

5
lib/ivis_common/Makefile.raw
View File

@ -1,5 +1,4 @@
MAKERULES=../../makerules include $(top_srcdir)/makerules/configure.mk
include $(MAKERULES)/configure.mk
SRC=bitimage.c \ SRC=bitimage.c \
imd.c \ imd.c \
@ -10,4 +9,4 @@ SRC=bitimage.c \
LIB=ivis_common LIB=ivis_common
include $(MAKERULES)/lib.mk include $(top_srcdir)/makerules/lib.mk

5
lib/ivis_opengl/Makefile.raw
View File

@ -1,5 +1,4 @@
MAKERULES=../../makerules include $(top_srcdir)/makerules/configure.mk
include $(MAKERULES)/configure.mk
SRC=GLee.c \ SRC=GLee.c \
ivi.c \ ivi.c \
@ -17,4 +16,4 @@ SRC=GLee.c \
LIB=ivis_opengl LIB=ivis_opengl
include $(MAKERULES)/lib.mk include $(top_srcdir)/makerules/lib.mk

7
lib/netplay/Makefile.raw
View File

@ -1,11 +1,10 @@
MAKERULES=../../makerules include $(top_srcdir)/makerules/configure.mk
include $(MAKERULES)/configure.mk
SRC= netjoin_stub.c \ SRC=netjoin_stub.c \
netlog.c \ netlog.c \
netplay.c \ netplay.c \
nettypes.c nettypes.c
LIB=netplay LIB=netplay
include $(MAKERULES)/lib.mk include $(top_srcdir)/makerules/lib.mk

7
lib/script/Makefile.raw
View File

@ -1,5 +1,4 @@
MAKERULES=../../makerules include $(top_srcdir)/makerules/configure.mk
include $(MAKERULES)/configure.mk
SRC=codeprint.c \ SRC=codeprint.c \
event.c \ event.c \
@ -14,5 +13,7 @@ SRC=codeprint.c \
LIB=script LIB=script
include $(MAKERULES)/lib.mk CLEANFILES=chat_parser.tab.h script_parser.tab.h
include $(top_srcdir)/makerules/lib.mk

5
lib/sequence/Makefile.raw
View File

@ -1,8 +1,7 @@
MAKERULES=../../makerules include $(top_srcdir)/makerules/configure.mk
include $(MAKERULES)/configure.mk
SRC=sequence.c SRC=sequence.c
LIB=sequence LIB=sequence
include $(MAKERULES)/lib.mk include $(top_srcdir)/makerules/lib.mk

5
lib/sound/Makefile.raw
View File

@ -1,5 +1,4 @@
MAKERULES=../../makerules include $(top_srcdir)/makerules/configure.mk
include $(MAKERULES)/configure.mk
SRC=audio.c \ SRC=audio.c \
audio_id.c \ audio_id.c \
@ -12,4 +11,4 @@ SRC=audio.c \
LIB=sound LIB=sound
include $(MAKERULES)/lib.mk include $(top_srcdir)/makerules/lib.mk

5
lib/sqlite3/Makefile.raw
View File

@ -1,8 +1,7 @@
MAKERULES=../../makerules include $(top_srcdir)/makerules/configure.mk
include $(MAKERULES)/configure.mk
SRC=physfs_vfs.c sqlite3.c SRC=physfs_vfs.c sqlite3.c
LIB=sqlite3 LIB=sqlite3
include $(MAKERULES)/lib.mk include $(top_srcdir)/makerules/lib.mk

5
lib/widget/Makefile.raw
View File

@ -1,5 +1,4 @@
MAKERULES=../../makerules include $(top_srcdir)/makerules/configure.mk
include $(MAKERULES)/configure.mk
SRC=bar.c \ SRC=bar.c \
button.c \ button.c \
@ -13,4 +12,4 @@ SRC=bar.c \
LIB=widget LIB=widget
include $(MAKERULES)/lib.mk include $(top_srcdir)/makerules/lib.mk

20
makerules/common.mk
View File

@ -1,14 +1,14 @@
%.o: %.rc %.o: $(srcdir)/%.rc
$(WINDRES) $(CPPFLAGS) -o$@ $< $(WINDRES) $(CPPFLAGS) -o $@ $<
%.o: %.c %.o: $(srcdir)/%.c
$(CC) $(CPPFLAGS) $(CFLAGS) -c -o$@ $< $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
%.o: %.cpp %.o: $(srcdir)/%.cpp
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o$@ $< $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
%.lex.h %.lex.c: %.l %.lex.h %.lex.c: $(srcdir)/%.l
$(FLEX) $(FLEXFLAGS) -o$@ $< $(FLEX) $(FLEXFLAGS) -o $@ $<
%.tab.h %.tab.c: %.y %.tab.h %.tab.c: $(srcdir)/%.y
$(BISON) -d $(BISONFLAGS) -o$@ $< $(BISON) -d $(BISONFLAGS) -o $@ $<

48
makerules/config.mk.tmpl
View File

@ -1,40 +1,40 @@
# Version of Warzone you are compiling # Metadata of the version of Warzone 2100 you are compiling
VERSION=TRUNK PACKAGE:=warzone2100
INSTALLER_VERSION=9.9.9.9 PACKAGE_NAME:=Warzone 2100
PACKAGE_BUGREPORT=http://wz2100.net/ PACKAGE_VERSION:=TRUNK
PACKAGE_NAME=Warzone 2100 PACKAGE_BUGREPORT:=http://wz2100.net/
PACKAGE_VERSION=$(VERSION) INSTALLER_VERSION:=9.9.9.9
# Platform you are running # Platform you are running
#PLATFORM=windows #PLATFORM:=windows
#PLATFORM=linux #PLATFORM:=linux
#PLATFORM=mingw32 #PLATFORM:=mingw32
# Compilation mode # Compilation mode
#MODE=debug #MODE:=debug
#MODE=release #MODE:=release
# Directory where you store your dev stuff (lib and include) # Directory where you store your dev stuff (lib and include)
#DEVDIR=C:/devpkg #DEVDIR:=C:/devpkg
# Remind the user to install Flex and Bison # Remind the user to install Flex and Bison
#BISON=bison #BISON:=bison
#FLEX=flex #FLEX:=flex
## This is only needed for people planning to distribute this package and/or ## This is only needed for people planning to distribute this package and/or
## create installers from it. ## create installers from it.
# Path to makensis # Path to makensis
#MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe" #MAKENSIS:="wine C:/Program\ Files/NSIS/makensis.exe"
#MAKENSIS=makensis #MAKENSIS:=makensis
# Whether to build data package and installer # Whether to build data package and installer
#DATA=yes #DATA:=yes
#INSTALLER=yes #INSTALLER:=yes
#USE_GETTEXT=yes #USE_GETTEXT:=yes
# Gettext stuff # Gettext stuff
#PACKAGE=warzone2100 #PACKAGE:=warzone2100
#LOCALEDIR="" #LOCALEDIR:=""
#XGETTEXT="xgettext" #XGETTEXT:="xgettext"
#MSGMERGE="msgmerge" #MSGMERGE:="msgmerge"
#MSGFMT="msgfmt" #MSGFMT:="msgfmt"

159
makerules/configure.mk
View File

@ -1,107 +1,160 @@
include $(MAKERULES)/config.mk include $(top_builddir)/config.mk
# Check for unset config # Check for unset config
ifeq ($(strip $(VERSION)),) ifeq ($(MAKELEVEL),0)
$(error You must set VERSION in $(MAKERULES)/config.mk)
$(info Checking config...)
ifeq ($(strip $(PACKAGE)),)
$(error You must set PACKAGE in $(top_srcdir)/makerules/config.mk)
else else
$(info VERSION set to $(VERSION)) $(info PACKAGE := $(PACKAGE))
endif
ifeq ($(strip $(PACKAGE_NAME)),)
$(error You must set PACKAGE_NAME in $(top_srcdir)/makerules/config.mk)
else
$(info PACKAGE_NAME := $(PACKAGE_NAME))
endif
ifeq ($(strip $(PACKAGE_VERSION)),)
$(error You must set PACKAGE_VERSION in $(top_srcdir)/makerules/config.mk)
else
$(info PACKAGE_VERSION := $(PACKAGE_VERSION))
endif
ifeq ($(strip $(PACKAGE_BUGREPORT)),)
$(error You must set PACKAGE_BUGREPORT in $(top_srcdir)/makerules/config.mk)
else
$(info PACKAGE_BUGREPORT := $(PACKAGE_BUGREPORT))
endif endif
ifeq ($(strip $(PLATFORM)),) ifeq ($(strip $(PLATFORM)),)
$(error You must set PLATFORM in $(MAKERULES)/config.mk) $(error You must set PLATFORM in $(top_srcdir)/makerules/config.mk)
else else
$(info PLATFORM set to $(PLATFORM)) $(info PLATFORM := $(PLATFORM))
endif endif
ifeq ($(strip $(MODE)),) ifeq ($(strip $(MODE)),)
$(error You must set MODE in $(MAKERULES)/config.mk) $(error You must set MODE in $(top_srcdir)/makerules/config.mk)
else else
$(info MODE set to $(MODE)) $(info MODE := $(MODE))
endif endif
ifeq ($(strip $(DEVDIR)),) ifeq ($(strip $(DEVDIR)),)
$(error You must set DEVDIR in $(MAKERULES)/config.mk) $(error You must set DEVDIR in $(top_srcdir)/makerules/config.mk)
else else
$(info DEVDIR set to $(DEVDIR)) $(info DEVDIR := $(DEVDIR))
endif endif
ifeq ($(strip $(BISON)),) ifeq ($(strip $(BISON)),)
$(error You must set BISON in $(MAKERULES)/config.mk) $(error You must set BISON in $(top_srcdir)/makerules/config.mk)
else else
$(info BISON is set to $(BISON)) $(info BISON := $(BISON))
endif endif
ifeq ($(strip $(FLEX)),) ifeq ($(strip $(FLEX)),)
$(error You must set FLEX in $(MAKERULES)/config.mk) $(error You must set FLEX in $(top_srcdir)/makerules/config.mk)
else else
$(info FLEX is set to $(FLEX)) $(info FLEX := $(FLEX))
endif endif
ifneq ($(strip $(INSTALLER)),) ifneq ($(strip $(INSTALLER)),)
ifeq ($(strip $(MAKENSIS)),) ifeq ($(strip $(MAKENSIS)),)
$(error You must set MAKENSIS in $(MAKERULES)/config.mk) $(error You must set MAKENSIS in $(top_srcdir)/makerules/config.mk)
else else
$(info MAKENSIS is set to $(MAKENSIS)) $(info MAKENSIS is := $(MAKENSIS))
endif endif
endif endif
$(info Config seems valid.)
endif
# Find ourselves
sub_path:=$(patsubst $(top_builddir)/%,%,$(CURDIR))
ifneq ($(strip $(sub_path)),$(top_builddir))
srcdir:=$(top_srcdir)/$(sub_path)
else
srcdir:=$(top_srcdir)
endif
builddir:=$(CURDIR)
# Setup paths and static values # Setup paths and static values
CFLAGS+=-DPACKAGE_VERSION=\"$(VERSION)\" -DYY_STATIC -DLOCALEDIR=\"$(LOCALEDIR)\" -DPACKAGE=\"$(PACKAGE)\" -I.. -I../.. -I$(DEVDIR)/include/SDL -I$(DEVDIR)/include/libpng12 -I$(DEVDIR)/include CPPFLAGS+=-DPACKAGE=\"$(PACKAGE)\" -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" -DYY_STATIC -I$(builddir) -I$(srcdir) -I$(top_srcdir) -I$(DEVDIR)/include/SDL -I$(DEVDIR)/include/libpng12 -I$(DEVDIR)/include/bfd -I$(DEVDIR)/include
CXXFLAGS+=-DPACKAGE_VERSION=\"$(VERSION)\" -DYY_STATIC -DLOCALEDIR=\"$(LOCALEDIR)\" -DPACKAGE=\"$(PACKAGE)\" -I.. -I../.. -I$(DEVDIR)/include/SDL -I$(DEVDIR)/include/libpng12 -I$(DEVDIR)/include
LDFLAGS+=-L$(DEVDIR)/lib
# Use C99
CFLAGS+=-std=gnu99 CFLAGS+=-std=gnu99
CXXFLAGS+=
LDFLAGS+=-L$(DEVDIR)/lib
# Setup build environment with config values # Setup build environment with config values
ifeq ($(strip $(MODE)),debug) ifeq ($(strip $(MODE)),debug)
CFLAGS+=-g -O0 -DDEBUG -Wall -Werror-implicit-function-declaration CPPFLAGS+=-DDEBUG -Wall -Werror-implicit-function-declaration
CXXFLAGS+=-g -O0 -DDEBUG -Wall CFLAGS+=-g -O0
CXXFLAGS+=-g -O0
else else
CFLAGS+=-DNDEBUG CPPFLAGS+=-DNDEBUG
CXXFLAGS+=-DNDEBUG
endif endif
ifeq ($(strip $(USE_GETTEXT)),yes) ifneq ($(strip $(USE_GETTEXT)),)
CFLAGS+=-DENABLE_NLS=1 CPPFLAGS+=-DENABLE_NLS=1
ifneq ($(LOCALEDIR),)
CPPFLAGS+=-DLOCALEDIR=$(LOCALEDIR)
endif
endif endif
ifeq ($(strip $(PLATFORM)),windows) ifeq ($(strip $(PLATFORM)),windows)
DIRSEP=\\ DIRSEP:=\\
RMF=del /F MV:=???
EXEEXT=.exe RM_F:=del /F
AR=ar RMDIR:=???
CC=gcc MKDIR_P:=???
CXX=g++ TEST_D:=???
WINDRES=windres EXEEXT:=.exe
CFLAGS+=-mwindows -DWIN32 AR:=ar
CXXFLAGS+=-mwindows -DWIN32 CC:=gcc
CXX:=g++
WINDRES:=windres
CPPFLAGS+=-DWIN32
CFLAGS+=-mwindows
CXXFLAGS+=-mwindows
LDFLAGS+=-lmingw32 -lSDLmain LDFLAGS+=-lmingw32 -lSDLmain
else else
ifeq ($(strip $(PLATFORM)),mingw32) ifeq ($(strip $(PLATFORM)),mingw32)
DIRSEP=/ DIRSEP:=/
RMF=rm -f MV:=mv
EXEEXT=.exe RM_F:=rm -f
AR=mingw32-ar RMDIR:=rmdir
CC=mingw32-gcc MKDIR_P:=mkdir -p
CXX=mingw32-g++ TEST_D:=test -d
WINDRES=mingw32-windres EXEEXT:=.exe
CFLAGS+=-mwindows -DWIN32 AR:=mingw32-ar
CXXFLAGS+=-mwindows -DWIN32 CC:=mingw32-gcc
CXX:=mingw32-g++
WINDRES:=mingw32-windres
CPPFLAGS+=-DWIN32
CFLAGS+=-mwindows
CXXFLAGS+=-mwindows
LDFLAGS+=-lmingw32 -lSDLmain LDFLAGS+=-lmingw32 -lSDLmain
else else
DIRSEP=/ DIRSEP:=/
RMF=rm -f MV:=mv
EXEEXT= RM_F:=rm -f
AR=ar RMDIR:=rmdir
CC=gcc MKDIR_P:=mkdir -p
CXX=g++ TEST_D:=test -d
WINDRES= EXEEXT:=
AR:=ar
CC:=gcc
CXX:=g++
WINDRES:=
endif endif
endif endif
@ -125,4 +178,4 @@ endif
LDFLAGS+=-liconv -lz -lfreetype -lfontconfig -lexpat LDFLAGS+=-liconv -lz -lfreetype -lfontconfig -lexpat
include $(MAKERULES)/common.mk include $(top_srcdir)/makerules/common.mk

10
makerules/exe.mk
View File

@ -1,6 +1,8 @@
include $(MAKERULES)/common.mk include $(top_srcdir)/makerules/common.mk
DEPS=$(patsubst %.c,%.o, $(SRC:%.rc=%.o)) $(LIBS) DEPS=$(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(patsubst %.rc,%.o,$(SRC)))) $(LIBS)
.PHONY: all clean
all: $(BUILT_SOURCES) $(EXE)$(EXEEXT) all: $(BUILT_SOURCES) $(EXE)$(EXEEXT)
@ -8,6 +10,4 @@ $(EXE)$(EXEEXT): $(DEPS)
$(CXX) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(CXX) $(CFLAGS) -o $@ $^ $(LDFLAGS)
clean: clean:
$(RMF) $(EXE)$(EXEEXT) *.o $(CLEANFILES) $(RM_F) $(EXE)$(EXEEXT) *.o $(CLEANFILES)
.PHONY: all clean

12
makerules/lib.mk
View File

@ -1,11 +1,11 @@
include $(MAKERULES)/common.mk include $(top_srcdir)/makerules/common.mk
all: $(BUILT_SOURCES) ../lib$(LIB).a .PHONY: all clean
../lib$(LIB).a: $(patsubst %.c,%.o, $(SRC:%.cpp=%.o)) all: $(top_builddir)/lib/lib$(LIB).a
$(top_builddir)/lib/lib$(LIB).a: $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(SRC)))
$(AR) rcv $@ $^ $(AR) rcv $@ $^
clean: clean:
$(RMF) ..$(DIRSEP)lib$(LIB).a *.o $(CLEANFILES) $(RM_F) $(top_builddir)/lib/lib$(LIB).a *.o $(CLEANFILES)
.PHONY: all clean

10
makerules/submake.mk Normal file
View File

@ -0,0 +1,10 @@
.PHONY: all clean $(SUBDIRS)
all clean: $(SUBDIRS)
$(SUBDIRS):
$(TEST_D) $(builddir)/$@ || $(MKDIR_P) $(builddir)/$@
$(MAKE) -f $(srcdir)/$@/Makefile.raw -C $(builddir)/$@ $(MAKECMDGOALS)
clean: $(SUBDIRS)
$(RMDIR) $(SUBDIRS)

8
pkg/Makefile.raw
View File

@ -1,7 +1,5 @@
include $(top_srcdir)/makerules/configure.mk
SUBDIRS=nsis SUBDIRS=nsis
all clean: $(SUBDIRS) include $(top_srcdir)/makerules/submake.mk
.PHONY: $(SUBDIRS)
$(SUBDIRS):
$(MAKE) -f Makefile.raw -C $@ $(MAKECMDGOALS)

13
pkg/nsis/Makefile.raw
View File

@ -1,17 +1,14 @@
MAKERULES=../../makerules include $(top_srcdir)/makerules/configure.mk
include $(MAKERULES)/configure.mk
SETUPFILE=warzone2100-$(VERSION).exe SETUPFILE=$(PACKAGE)-$(PACKAGE_VERSION).exe
all: all:
ifdef INSTALLER ifdef INSTALLER
ifeq ($(strip $(PLATFORM)),windows)
all: $(SETUPFILE) all: $(SETUPFILE)
endif endif
endif
$(SETUPFILE): warzone2100.nsi ../src/warzone2100.exe ../data/base.wz ../data/mp.wz ../data/mods/global/grim.wz $(SETUPFILE): $(srcdir)/warzone2100.nsi $(top_builddir)/src/warzone2100.exe $(top_builddir)/data/base.wz $(top_builddir)/data/mp.wz $(top_builddir)/data/mods/global/grim.wz
$(MAKENSIS) -DPACKAGE="$(PACKAGE)" -DPACKAGE_NAME="$(PACKAGE_NAME)" -DPACKAGE_VERSION="$(VERSION)" -DPACKAGE_BUGREPORT="$(PACKAGE_BUGREPORT)" -DVERSIONNUM="$(INSTALLER_VERSION)" -DEXTDIR="$(DEVDIR)\bin" -DLOCALEDIR=$(LOCALEDIR) $< $(MAKENSIS) -DPACKAGE="$(PACKAGE)" -DPACKAGE_NAME="$(PACKAGE_NAME)" -DPACKAGE_VERSION="$(PACKAGE_VERSION)" -DPACKAGE_BUGREPORT="$(PACKAGE_BUGREPORT)" -DVERSIONNUM="$(INSTALLER_VERSION)" -DEXTDIR="$(DEVDIR)\bin" -DLOCALEDIR=$(LOCALEDIR) $<
clean: clean:
$(RMF) $(SETUPFILE) $(RM_F) $(SETUPFILE)

32
po/Makefile.raw
View File

@ -1,32 +1,32 @@
MAKERULES=../makerules include $(top_srcdir)/makerules/configure.mk
include $(MAKERULES)/configure.mk
include $(srcdir)/Makevars
PO_FILES=nb.po de.po da.po nl.po la.po
MO_FILES=$(patsubst %.po,%.gmo,$(PO_FILES))
.PHONY: all clean update-po po-files mo-files .PHONY: all clean update-po po-files mo-files
all:
ifdef USE_GETTEXT ifdef USE_GETTEXT
all: po-files mo-files all: po-files mo-files
endif endif
PO_FILES=nb.po de.po da.po nl.po la.po po-files: $(patsubst %,$(srcdir)/%,$(PO_FILES))
MO_FILES=$(patsubst %.po,%.gmo, $(PO_FILES))
po-files: $(PO_FILES)
mo-files: $(MO_FILES) mo-files: $(MO_FILES)
update-po: clean all update-po: clean all
$(PACKAGE).pot: POTFILES.in $(DOMAIN).pot: $(srcdir)/POTFILES.in
$(XGETTEXT) --default-domain=$(PACKAGE) --directory=.. --add-comments=TRANSLATORS: --keyword=_ --keyword=N_ --keyword=P_:1c,2 --keyword=NP_:1c,2 --files-from=$< --copyright-holder="Warzone Resurrection Project" --msgid-bugs-address="warzone-dev@gna.org" $(XGETTEXT) $(XGETTEXT_OPTIONS) --default-domain=$(DOMAIN) --copyright-holder=$(COPYRIGHT_HOLDER) --msgid-bugs-address=$(MSGID_BUGS_ADDRESS) --directory=$(top_builddir) --add-comments=TRANSLATORS: --files-from=$<
mv $(PACKAGE).po $@ mv $(DOMAIN).po $@
%.po: $(PACKAGE).pot $(srcdir)/%.po: $(srcdir)/$(DOMAIN).pot
$(MSGMERGE) $@ $(PACKAGE).pot -o $@.new $(MSGMERGE) $(MSGMERGE_OPTIONS) $@ $(DOMAIN).pot -o $@.new
mv $@.new $@ $(MV) $@.new $@
%.gmo: %.po %.gmo: $(srcdir)/%.po
$(MSGFMT) -c -o $@ $< $(MSGFMT) -c -o $@ $<
clean: clean:
$(RMF) $(PACKAGE).pot $(RM_F) $(PACKAGE).pot
$(RMF) $(MO_FILES) $(RM_F) $(MO_FILES)

31
src/Makefile.raw
View File

@ -1,5 +1,4 @@
MAKERULES=../makerules include $(top_srcdir)/makerules/configure.mk
include $(MAKERULES)/configure.mk
SRC=ai.c \ SRC=ai.c \
aiexperience.c \ aiexperience.c \
@ -107,22 +106,24 @@ SRC=ai.c \
version.c \ version.c \
warzoneconfig.c warzoneconfig.c
LIBS=../lib/libgamelib.a \ LIBS=$(top_builddir)/lib/libgamelib.a \
../lib/libivis_common.a \ $(top_builddir)/lib/libivis_common.a \
../lib/libivis_opengl.a \ $(top_builddir)/lib/libivis_opengl.a \
../lib/libnetplay.a \ $(top_builddir)/lib/libnetplay.a \
../lib/libscript.a \ $(top_builddir)/lib/libscript.a \
../lib/libsequence.a \ $(top_builddir)/lib/libsequence.a \
../lib/libsound.a \ $(top_builddir)/lib/libsound.a \
../lib/libwidget.a \ $(top_builddir)/lib/libwidget.a \
../lib/libframework.a \ $(top_builddir)/lib/libframework.a \
../lib/libexceptionhandler.a \ $(top_builddir)/lib/libexceptionhandler.a \
../lib/libsqlite3.a $(top_builddir)/lib/libsqlite3.a
ifeq ($(strip $(PLATFORM)),windows) ifeq ($(strip $(PLATFORM)),windows)
LIBS += ../win32/warzone2100.o LIBS += $(top_builddir)/win32/warzone2100.o
endif endif
EXE=warzone2100 EXE=warzone2100
include $(MAKERULES)/exe.mk CLEANFILES=scriptvals_parser.tab.h
include $(top_srcdir)/makerules/exe.mk

10
tools/lobbyserver_cpp/src/Makefile.raw
View File

@ -14,19 +14,13 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# include $(top_srcdir)/makerules/configure.mk
# $Revision$
# $Id$
# $HeadURL$
MAKERULES=../../../makerules
include $(MAKERULES)/configure.mk
OBJS=main.o lobby/read_write_mutex.o networking/tcp_server.o lobby/lobby.o lobby/game.o lobby/raii_counter.o lobby/lobby_iterator.o lobby/lobby_gamelock.o requesthandler.o networking/nattester.o OBJS=main.o lobby/read_write_mutex.o networking/tcp_server.o lobby/lobby.o lobby/game.o lobby/raii_counter.o lobby/lobby_iterator.o lobby/lobby_gamelock.o requesthandler.o networking/nattester.o
BOOST_DIR=C:/boost_1_33_1 BOOST_DIR=C:/boost_1_33_1
BOOST_ASIO_DIR=C:/boost_asio_0_3_7 BOOST_ASIO_DIR=C:/boost_asio_0_3_7
WARZONE_LIBDIR=../../../lib WARZONE_LIBDIR=$(top_builddir)/lib
ifeq ($(RELEASE),) ifeq ($(RELEASE),)
BOOST_THREADS=$(BOOST_DIR)/bin/boost/libs/thread/build/libboost_thread.lib/mingw/debug/threading-multi/libboost_thread-mgw-mt-d-1_33_1.lib BOOST_THREADS=$(BOOST_DIR)/bin/boost/libs/thread/build/libboost_thread.lib/mingw/debug/threading-multi/libboost_thread-mgw-mt-d-1_33_1.lib

5
win32/Makefile.raw
View File

@ -1,9 +1,8 @@
MAKERULES=../makerules include $(top_srcdir)/makerules/configure.mk
include $(MAKERULES)/configure.mk
ifeq ($(strip $(PLATFORM)),windows) ifeq ($(strip $(PLATFORM)),windows)
all: warzone2100.o all: warzone2100.o
endif endif
clean: clean:
$(RMF) warzone2100.o $(RM_F) warzone2100.o