Build configuration changes to align the SDL builds with the Mac equivalents. Added the pkg-win-deployment configuration for stable releases. The deployment settings are forced, while the test release ones are adjustable. Tested successfully on Windows for the test releae, deployment, snapshot and debug configurations. Linux testing still needed.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2746 127b21dd-08f5-0310-b4b7-95ae10353056master
Nikos Barkas
parent
8d95596e87
commit
e1c1924e9e
63
GNUmakefile
63
GNUmakefile
|
|
@ -1,10 +1,19 @@
|
|||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
CP = cp
|
||||
|
||||
# Setting the build parameters independently. We need everything set as below for the full test release configuration.
|
||||
BUILD_WITH_DEBUG_FUNCTIONALITY = yes
|
||||
NO_SHADERS = no
|
||||
DOCKING_CLEARANCE = yes
|
||||
PROCEDURAL_PLANETS = yes
|
||||
WORMHOLE_SCANNER = yes
|
||||
TARGET_INCOMING_MISSILES = yes
|
||||
OO_CHECK_GL_HEAVY = no
|
||||
OO_EXCLUDE_DEBUG_SUPPORT = no
|
||||
OO_OXP_VERIFIER_ENABLED = yes
|
||||
OO_LOCALIZATION_TOOLS = yes
|
||||
DEBUG_GRAPHVIZ = yes
|
||||
|
||||
vpath %.m src/SDL:src/Core:src/Core/Entities:src/Core/Materials:src/Core/Scripting:src/Core/OXPVerifier:src/Core/Debug
|
||||
vpath %.h src/SDL:src/Core:src/Core/Entities:src/Core/Materials:src/Core/Scripting:src/Core/OXPVerifier:src/Core/Debug
|
||||
vpath %.c src/SDL:src/Core:src/BSDCompat:src/Core/Debug
|
||||
|
|
@ -39,12 +48,14 @@ ifeq ($(debug),yes)
|
|||
ADDITIONAL_CFLAGS += -g -O0
|
||||
ADDITIONAL_OBJCFLAGS += -g -O0
|
||||
GNUSTEP_OBJ_DIR_NAME := $(GNUSTEP_OBJ_DIR_NAME).dbg
|
||||
ADDITIONAL_CFLAGS += -DDEBUG -DOO_DEBUG -DDEBUG_GRAPHVIZ
|
||||
ADDITIONAL_OBJCFLAGS += -DDEBUG -DOO_DEBUG -DDEBUG_GRAPHVIZ
|
||||
ADDITIONAL_CFLAGS += -DDEBUG -DOO_DEBUG
|
||||
ADDITIONAL_OBJCFLAGS += -DDEBUG -DOO_DEBUG
|
||||
endif
|
||||
ifeq ($(BUILD_WITH_DEBUG_FUNCTIONALITY),no)
|
||||
ADDITIONAL_CFLAGS += -DNDEBUG
|
||||
ADDITIONAL_OBJCFLAGS += -DNDEBUG
|
||||
|
||||
# these are common settings for both test and deployment release configurations
|
||||
ifeq ($(NO_SHADERS),yes)
|
||||
ADDITIONAL_CFLAGS += -DNO_SHADERS=1
|
||||
ADDITIONAL_OBJCFLAGS += -DNO_SHADERS=1
|
||||
endif
|
||||
ifeq ($(PROCEDURAL_PLANETS),yes)
|
||||
ADDITIONAL_CFLAGS += -DALLOW_PROCEDURAL_PLANETS=1
|
||||
|
|
@ -63,6 +74,48 @@ ifeq ($(TARGET_INCOMING_MISSILES),yes)
|
|||
ADDITIONAL_OBJCFLAGS += -DTARGET_INCOMING_MISSILES=1
|
||||
endif
|
||||
|
||||
# DEPLOYMENT_RELEASE_CONGIGURATION value is passed from Makefile. Note that the deployment release settings
|
||||
# are forced, while test release settings are adjustable.
|
||||
ifeq ($(DEPLOYMENT_RELEASE_CONFIGURATION),yes)
|
||||
ADDITIONAL_CFLAGS += -DNDEBUG
|
||||
ADDITIONAL_OBJCFLAGS += -DNDEBUG
|
||||
ADDITIONAL_CFLAGS += -DOO_CHECK_GL_HEAVY=0
|
||||
ADDITIONAL_OBJCFLAGS += -DOO_CHECK_GL_HEAVY=0
|
||||
ADDITIONAL_CFLAGS += -DOO_EXCLUDE_DEBUG_SUPPORT=1
|
||||
ADDITIONAL_OBJCFLAGS += -DOO_EXCLUDE_DEBUG_SUPPORT=1
|
||||
ADDITIONAL_CFLAGS += -DOO_OXP_VERIFIER_ENABLED=0
|
||||
ADDITIONAL_OBJCFLAGS += -DOO_OXP_VERIFIER_ENABLED=0
|
||||
ADDITIONAL_CFLAGS += -DOO_LOCALIZATION_TOOLS=0
|
||||
ADDITIONAL_OBJCFLAGS += -DOO_LOCALIZATION_TOOLS=0
|
||||
ADDITIONAL_CFLAGS += -DDEBUG_GRAPHVIZ=0
|
||||
ADDITIONAL_OBJCFLAGS += -DDEBUG_GRAPHVIZ=0
|
||||
else
|
||||
ifeq ($(BUILD_WITH_DEBUG_FUNCTIONALITY),no)
|
||||
ADDITIONAL_CFLAGS += -DNDEBUG
|
||||
ADDITIONAL_OBJCFLAGS += -DNDEBUG
|
||||
endif
|
||||
ifeq ($(OO_CHECK_GL_HEAVY),yes)
|
||||
ADDITIONAL_CFLAGS += -DOO_CHECK_GL_HEAVY=1
|
||||
ADDITIONAL_OBJCFLAGS += -DOO_CHECK_GL_HEAVY=1
|
||||
endif
|
||||
ifeq ($(OO_EXCLUDE_DEBUG_SUPPORT),yes)
|
||||
ADDITIONAL_CFLAGS += -DOO_EXCLUDE_DEBUG_SUPPORT=1
|
||||
ADDITIONAL_OBJCFLAGS += -DOO_EXCLUDE_DEBUG_SUPPORT=1
|
||||
endif
|
||||
ifeq ($(OO_OXP_VERIFIER_ENABLED),yes)
|
||||
ADDITIONAL_CFLAGS += -DOO_OXP_VERIFIER_ENABLED=1
|
||||
ADDITIONAL_OBJCFLAGS += -DOO_OXP_VERIFIER_ENABLED=1
|
||||
endif
|
||||
ifeq ($(OO_LOCALIZATION_TOOLS),yes)
|
||||
ADDITIONAL_CFLAGS += -DOO_LOCALIZATION_TOOLS=1
|
||||
ADDITIONAL_OBJCFLAGS += -DOO_LOCALIZATION_TOOLS=1
|
||||
endif
|
||||
ifeq ($(DEBUG_GRAPHVIZ),yes)
|
||||
ADDITIONAL_CFLAGS += -DDEBUG_GRAPHVIZ=1
|
||||
ADDITIONAL_OBJCFLAGS += -DDEBUG_GRAPHVIZ=1
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(SNAPSHOT_BUILD), yes)
|
||||
ADDITIONAL_CFLAGS += -DSNAPSHOT_BUILD -DOOLITE_SNAPSHOT_VERSION=\"$(VERSION_STRING)\"
|
||||
ADDITIONAL_OBJCFLAGS += -DSNAPSHOT_BUILD -DOOLITE_SNAPSHOT_VERSION=\"$(VERSION_STRING)\"
|
||||
|
|
|
|||
13
Makefile
13
Makefile
|
|
@ -39,6 +39,10 @@ DEPS=$(LIBJS)
|
|||
release: $(DEPS)
|
||||
make -f GNUmakefile debug=no
|
||||
|
||||
.PHONY: release-deployment
|
||||
release-deployment: $(DEPS)
|
||||
make -f GNUmakefile DEPLOYMENT_RELEASE_CONFIGURATION=yes debug=no
|
||||
|
||||
.PHONY: release-snapshot
|
||||
release-snapshot: $(DEPS)
|
||||
make -f GNUmakefile SNAPSHOT_BUILD=yes VERSION_STRING=$(VER) debug=no
|
||||
|
|
@ -66,7 +70,7 @@ endif
|
|||
rm -Rf obj obj.dbg oolite.app
|
||||
|
||||
.PHONY: all
|
||||
all: release release-snapshot debug
|
||||
all: release release-deployment release-snapshot debug
|
||||
|
||||
.PHONY: remake
|
||||
remake: clean all
|
||||
|
|
@ -117,6 +121,10 @@ ${NSISVERSIONS}:
|
|||
.PHONY: pkg-win
|
||||
pkg-win: release ${NSISVERSIONS}
|
||||
$(NSIS) installers/win32/OOlite.nsi
|
||||
|
||||
.PHONY: pkg-win-deployment
|
||||
pkg-win-deployment: release-deployment ${NSISVERSIONS}
|
||||
$(NSIS) installers/win32/OOlite.nsi
|
||||
|
||||
.PHONY: pkg-win-snapshot
|
||||
pkg-win-snapshot: release-snapshot ${NSISVERSIONS}
|
||||
|
|
@ -138,5 +146,6 @@ help:
|
|||
@echo
|
||||
@echo " pkg-autopackage - builds a Linux autopackage"
|
||||
@echo
|
||||
@echo " pkg-win - builds a release version Windows installer package"
|
||||
@echo " pkg-win - builds a release version Windows installer package (test release)"
|
||||
@echo " pkg-win-deployment - builds a release version Windows installer package (deployment release)"
|
||||
@echo " pkg-win-snapshot - builds a snapshot version Windows installer package"
|
||||
|
|
|
|||
Loading…
Reference in New Issue