Makefiles - rework to accomodate new Javascript library
(Combined effort from Micha, Konstantinos, and Nikos)
+ removed support for building legacy libjs
+ (Linux only) now use the MacOS update script to auto-download the JS library
- download script failure checks tweaked for older versions of bash
+ new Makefiles:
- libjs.make - to download & build libjs (Linux only)
- config.make - contains shared configuration variables between makefiles
+ debian packaging rules updated to suit
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4362 127b21dd-08f5-0310-b4b7-95ae10353056
master
Michael Werle
parent
3f86e98fd1
commit
d915f5fde5
654
GNUmakefile
654
GNUmakefile
|
|
@ -1,409 +1,375 @@
|
|||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
VERBOSE = yes
|
||||
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
|
||||
ESPEAK = yes
|
||||
OO_CHECK_GL_HEAVY = no
|
||||
OO_EXCLUDE_DEBUG_SUPPORT = no
|
||||
OO_OXP_VERIFIER_ENABLED = yes
|
||||
OO_LOCALIZATION_TOOLS = yes
|
||||
DEBUG_GRAPHVIZ = yes
|
||||
JS_ECMAv5 = yes
|
||||
# use_deps = no
|
||||
include config.make
|
||||
|
||||
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
|
||||
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_USER_ROOT)
|
||||
GNUSTEP_OBJ_DIR_BASENAME := $(GNUSTEP_OBJ_DIR_NAME)
|
||||
HOST_ARCH := $(shell echo $(GNUSTEP_HOST_CPU) | sed -e s/i.86/x86/ -e s/amd64/x86_64/ )
|
||||
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_USER_ROOT)
|
||||
GNUSTEP_OBJ_DIR_BASENAME := $(GNUSTEP_OBJ_DIR_NAME)
|
||||
HOST_ARCH := $(shell echo $(GNUSTEP_HOST_CPU) | sed -e s/i.86/x86/ -e s/amd64/x86_64/ )
|
||||
ifeq ($(GNUSTEP_HOST_OS),mingw32)
|
||||
ifeq ($(JS_ECMAv5),yes)
|
||||
JS_INCLUDE_DIR = deps/Windows-x86-deps/JS32ECMAv5/include
|
||||
JS_LIB_DIR = deps/Windows-x86-deps/JS32ECMAv5/lib
|
||||
ifeq ($(debug),yes)
|
||||
JS_IMPORT_LIBRARY = js32ECMAv5dbg
|
||||
else
|
||||
JS_IMPORT_LIBRARY = js32ECMAv5
|
||||
endif
|
||||
else
|
||||
JS_INCLUDE_DIR = deps/Cross-platform-deps/SpiderMonkey/js/src
|
||||
JS_LIB_DIR =
|
||||
JS_IMPORT_LIBRARY = js32
|
||||
endif
|
||||
ADDITIONAL_INCLUDE_DIRS = -Ideps/Windows-x86-deps/include -I$(JS_INCLUDE_DIR) -Isrc/SDL -Isrc/Core -Isrc/BSDCompat -Isrc/Core/Scripting -Isrc/Core/Materials -Isrc/Core/Entities -Isrc/Core/OXPVerifier -Isrc/Core/Debug -Isrc/Core/Tables
|
||||
ADDITIONAL_OBJC_LIBS = -lglu32 -lopengl32 -lpng14.dll -lmingw32 -lSDLmain -lSDL -lSDL_mixer -lgnustep-base -l$(JS_IMPORT_LIBRARY) -lwinmm -mwindows
|
||||
ADDITIONAL_CFLAGS = -DWIN32 -DNEED_STRLCPY `sdl-config --cflags`
|
||||
JS_INCLUDE_DIR = deps/Windows-x86-deps/JS32ECMAv5/include
|
||||
JS_LIB_DIR = deps/Windows-x86-deps/JS32ECMAv5/lib
|
||||
ifeq ($(debug),yes)
|
||||
JS_IMPORT_LIBRARY = js32ECMAv5dbg
|
||||
else
|
||||
JS_IMPORT_LIBRARY = js32ECMAv5
|
||||
endif
|
||||
ADDITIONAL_INCLUDE_DIRS = -Ideps/Windows-x86-deps/include -I$(JS_INCLUDE_DIR) -Isrc/SDL -Isrc/Core -Isrc/BSDCompat -Isrc/Core/Scripting -Isrc/Core/Materials -Isrc/Core/Entities -Isrc/Core/OXPVerifier -Isrc/Core/Debug -Isrc/Core/Tables
|
||||
ADDITIONAL_OBJC_LIBS = -lglu32 -lopengl32 -lpng14.dll -lmingw32 -lSDLmain -lSDL -lSDL_mixer -lgnustep-base -l$(JS_IMPORT_LIBRARY) -lwinmm -mwindows
|
||||
ADDITIONAL_CFLAGS = -DWIN32 -DNEED_STRLCPY `sdl-config --cflags`
|
||||
# note the vpath stuff above isn't working for me, so adding src/SDL and src/Core explicitly
|
||||
ADDITIONAL_OBJCFLAGS = -DLOADSAVEGUI -DWIN32 -DXP_WIN -Wno-import -std=gnu99 `sdl-config --cflags`
|
||||
oolite_LIB_DIRS += -L/usr/local/lib -L$(GNUSTEP_LOCAL_ROOT)/lib -Ldeps/Windows-x86-deps/lib -L$(JS_LIB_DIR)
|
||||
ifeq ($(ESPEAK),yes)
|
||||
ADDITIONAL_OBJC_LIBS += -lespeak.dll
|
||||
ADDITIONAL_OBJCFLAGS+=-DHAVE_LIBESPEAK=1
|
||||
GNUSTEP_OBJ_DIR_NAME := $(GNUSTEP_OBJ_DIR_NAME).spk
|
||||
endif
|
||||
ADDITIONAL_OBJCFLAGS = -DLOADSAVEGUI -DWIN32 -DXP_WIN -Wno-import -std=gnu99 `sdl-config --cflags`
|
||||
oolite_LIB_DIRS += -L/usr/local/lib -L$(GNUSTEP_LOCAL_ROOT)/lib -Ldeps/Windows-x86-deps/lib -L$(JS_LIB_DIR)
|
||||
ifeq ($(ESPEAK),yes)
|
||||
ADDITIONAL_OBJC_LIBS += -lespeak.dll
|
||||
ADDITIONAL_OBJCFLAGS +=-DHAVE_LIBESPEAK=1
|
||||
GNUSTEP_OBJ_DIR_NAME := $(GNUSTEP_OBJ_DIR_NAME).spk
|
||||
endif
|
||||
else
|
||||
ifeq ($(JS_ECMAv5),yes)
|
||||
LIBJS_SRC_DIR_COMMON = deps/Linux-deps/JS32ECMAv5/include
|
||||
LIBJS_SRC_DIR = deps/Linux-deps/JS32ECMAv5/$(HOST_ARCH)/include
|
||||
LIBJS_BIN_DIR = deps/Linux-deps/JS32ECMAv5/$(HOST_ARCH)/lib/
|
||||
ifeq ($(debug),no)
|
||||
JS_IMPORT_LIBRARY = libjs_static.a # this is the release optimized version of libmozjs
|
||||
else
|
||||
JS_IMPORT_LIBRARY = libmozjs.so # this is for the debug version of libmozjs (not yet used)
|
||||
endif
|
||||
else
|
||||
LIBJS_SRC_DIR = deps/Cross-platform-deps/SpiderMonkey/js/src
|
||||
ifeq ($(JS_OPT),no)
|
||||
LIBJS_BIN_DIR=$(LIBJS_SRC_DIR)/Linux_All_DBG.OBJ
|
||||
else
|
||||
LIBJS_BIN_DIR=$(LIBJS_SRC_DIR)/Linux_All_OPT.OBJ
|
||||
endif
|
||||
JS_IMPORT_LIBRARY = libjs.a
|
||||
endif
|
||||
ADDITIONAL_INCLUDE_DIRS = -I$(LIBJS_SRC_DIR_COMMON) -I$(LIBJS_SRC_DIR) -I$(LIBJS_BIN_DIR) -Isrc/SDL -Isrc/Core -Isrc/BSDCompat -Isrc/Core/Scripting -Isrc/Core/Materials -Isrc/Core/Entities -Isrc/Core/OXPVerifier -Isrc/Core/Debug -Isrc/Core/Tables
|
||||
ADDITIONAL_OBJC_LIBS = $(LIBJS_BIN_DIR)/$(JS_IMPORT_LIBRARY) -lGLU -lGL -lX11
|
||||
ADDITIONAL_CFLAGS = -Wall -DLINUX -DNEED_STRLCPY `sdl-config --cflags`
|
||||
ADDITIONAL_OBJCFLAGS = -Wall -std=c99 -DLOADSAVEGUI -DLINUX -DXP_UNIX -Wno-import `sdl-config --cflags`
|
||||
oolite_LIB_DIRS += -L/usr/X11R6/lib/
|
||||
ifeq ($(debug),yes)
|
||||
LIBJS_ROOT = deps/Cross-platform-deps/mozilla/js/src/build-debug
|
||||
else
|
||||
LIBJS_ROOT = deps/Cross-platform-deps/mozilla/js/src/build-release
|
||||
endif
|
||||
LIBJS_INC_DIR = $(LIBJS_ROOT)/dist/include
|
||||
LIBJS_LIB_DIR = $(LIBJS_ROOT)/dist/lib
|
||||
LIBJS = js_static
|
||||
|
||||
ifeq ($(use_deps),yes)
|
||||
oolite_LIB_DIRS += -Ldeps/Linux-deps/$(HOST_ARCH)/lib_linker
|
||||
ADDITIONAL_OBJC_LIBS += -lpng14 -lSDL_mixer -lSDL -lgnustep-base
|
||||
ADDITIONAL_INCLUDE_DIRS += -Ideps/Linux-deps/include
|
||||
ifeq ($(ESPEAK),yes)
|
||||
ADDITIONAL_OBJC_LIBS += -lespeak
|
||||
ADDITIONAL_OBJCFLAGS+=-DHAVE_LIBESPEAK=1
|
||||
GNUSTEP_OBJ_DIR_NAME := $(GNUSTEP_OBJ_DIR_NAME).spk
|
||||
endif
|
||||
else
|
||||
ADDITIONAL_OBJC_LIBS += -lpng -lSDL -lSDL_mixer -lgnustep-base
|
||||
ifeq ($(ESPEAK),yes)
|
||||
ADDITIONAL_OBJC_LIBS += -lespeak
|
||||
ADDITIONAL_OBJCFLAGS+=-DHAVE_LIBESPEAK=1
|
||||
GNUSTEP_OBJ_DIR_NAME := $(GNUSTEP_OBJ_DIR_NAME).spk
|
||||
endif
|
||||
endif
|
||||
ADDITIONAL_INCLUDE_DIRS = -I$(LIBJS_INC_DIR) -Isrc/SDL -Isrc/Core -Isrc/BSDCompat -Isrc/Core/Scripting -Isrc/Core/Materials -Isrc/Core/Entities -Isrc/Core/OXPVerifier -Isrc/Core/Debug -Isrc/Core/Tables
|
||||
ADDITIONAL_OBJC_LIBS = -lGLU -lGL -lX11 -lSDL -lSDL_mixer -lgnustep-base -l$(LIBJS) `nspr-config --libs`
|
||||
ADDITIONAL_CFLAGS = -Wall -DLINUX -DNEED_STRLCPY `sdl-config --cflags` `nspr-config --cflags`
|
||||
ADDITIONAL_OBJCFLAGS = -Wall -std=c99 -DLOADSAVEGUI -DLINUX -DXP_UNIX -Wno-import `sdl-config --cflags` `nspr-config --cflags`
|
||||
oolite_LIB_DIRS += -L/usr/X11R6/lib/ -L$(LIBJS_LIB_DIR)
|
||||
|
||||
ifeq ($(JS_ECMAv5),yes)
|
||||
ADDITIONAL_OBJCFLAGS+=-DMOZ_TRACE_JSCALLS=1
|
||||
endif
|
||||
ifeq ($(use_deps),yes)
|
||||
oolite_LIB_DIRS += -Ldeps/Linux-deps/$(HOST_ARCH)/lib_linker
|
||||
ADDITIONAL_OBJC_LIBS += -lpng14
|
||||
ADDITIONAL_INCLUDE_DIRS += -Ideps/Linux-deps/include
|
||||
else
|
||||
ADDITIONAL_OBJC_LIBS += -lpng
|
||||
endif
|
||||
ifeq ($(ESPEAK),yes)
|
||||
ADDITIONAL_OBJC_LIBS += -lespeak
|
||||
ADDITIONAL_OBJCFLAGS += -DHAVE_LIBESPEAK=1
|
||||
GNUSTEP_OBJ_DIR_NAME := $(GNUSTEP_OBJ_DIR_NAME).spk
|
||||
endif
|
||||
ifeq ($(OO_JAVASCRIPT_TRACE),yes)
|
||||
ADDITIONAL_OBJCFLAGS += -DMOZ_TRACE_JSCALLS=1
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(profile),yes)
|
||||
ADDITIONAL_CFLAGS += -g -pg
|
||||
ADDITIONAL_OBJCFLAGS += -g -pg
|
||||
ADDITIONAL_CFLAGS += -g -pg
|
||||
ADDITIONAL_OBJCFLAGS += -g -pg
|
||||
endif
|
||||
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
|
||||
ADDITIONAL_OBJCFLAGS += -DDEBUG -DOO_DEBUG
|
||||
ADDITIONAL_CFLAGS += -g -O0
|
||||
ADDITIONAL_OBJCFLAGS += -g -O0
|
||||
GNUSTEP_OBJ_DIR_NAME := $(GNUSTEP_OBJ_DIR_NAME).dbg
|
||||
ADDITIONAL_CFLAGS += -DDEBUG -DOO_DEBUG
|
||||
ADDITIONAL_OBJCFLAGS += -DDEBUG -DOO_DEBUG
|
||||
endif
|
||||
|
||||
# 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
|
||||
ADDITIONAL_CFLAGS += -DNO_SHADERS=1
|
||||
ADDITIONAL_OBJCFLAGS += -DNO_SHADERS=1
|
||||
endif
|
||||
|
||||
# DEPLOYMENT_RELEASE_CONFIGURATION 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
|
||||
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
|
||||
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)\"
|
||||
ADDITIONAL_CFLAGS += -DSNAPSHOT_BUILD -DOOLITE_SNAPSHOT_VERSION=\"$(VERSION_STRING)\"
|
||||
ADDITIONAL_OBJCFLAGS += -DSNAPSHOT_BUILD -DOOLITE_SNAPSHOT_VERSION=\"$(VERSION_STRING)\"
|
||||
endif
|
||||
|
||||
OBJC_PROGRAM_NAME = oolite
|
||||
|
||||
oolite_C_FILES = \
|
||||
legacy_random.c \
|
||||
strlcpy.c \
|
||||
OOTCPStreamDecoder.c \
|
||||
OOPlanetData.c
|
||||
legacy_random.c \
|
||||
strlcpy.c \
|
||||
OOTCPStreamDecoder.c \
|
||||
OOPlanetData.c
|
||||
|
||||
|
||||
OOLITE_DEBUG_FILES = \
|
||||
OODebugMonitor.m \
|
||||
OODebugSupport.m \
|
||||
OODebugTCPConsoleClient.m \
|
||||
OOJSConsole.m \
|
||||
OOProfilingStopwatch.m \
|
||||
OOTCPStreamDecoderAbstractionLayer.m
|
||||
OODebugMonitor.m \
|
||||
OODebugSupport.m \
|
||||
OODebugTCPConsoleClient.m \
|
||||
OOJSConsole.m \
|
||||
OOProfilingStopwatch.m \
|
||||
OOTCPStreamDecoderAbstractionLayer.m
|
||||
|
||||
OOLITE_ENTITY_FILES = \
|
||||
DustEntity.m \
|
||||
Entity.m \
|
||||
OOEntityWithDrawable.m \
|
||||
OOParticleSystem.m \
|
||||
PlanetEntity.m \
|
||||
PlayerEntity.m \
|
||||
PlayerEntityContracts.m \
|
||||
PlayerEntityControls.m \
|
||||
PlayerEntityLegacyScriptEngine.m \
|
||||
PlayerEntityLoadSave.m \
|
||||
PlayerEntityScriptMethods.m \
|
||||
PlayerEntitySound.m \
|
||||
PlayerEntityStickMapper.m \
|
||||
ProxyPlayerEntity.m \
|
||||
OOBreakPatternEntity.m \
|
||||
ShipEntity.m \
|
||||
ShipEntityAI.m \
|
||||
ShipEntityScriptMethods.m \
|
||||
SkyEntity.m \
|
||||
StationEntity.m \
|
||||
OOSunEntity.m \
|
||||
WormholeEntity.m \
|
||||
OOLightParticleEntity.m \
|
||||
OOFlasherEntity.m \
|
||||
OOExhaustPlumeEntity.m \
|
||||
OOSparkEntity.m \
|
||||
OOECMBlastEntity.m \
|
||||
OOPlanetEntity.m \
|
||||
OOPlasmaShotEntity.m \
|
||||
OOPlasmaBurstEntity.m \
|
||||
OOFlashEffectEntity.m \
|
||||
ShipEntityLoadRestore.m \
|
||||
OOLaserShotEntity.m \
|
||||
OOQuiriumCascadeEntity.m \
|
||||
OORingEffectEntity.m
|
||||
DustEntity.m \
|
||||
Entity.m \
|
||||
OOEntityWithDrawable.m \
|
||||
OOParticleSystem.m \
|
||||
PlanetEntity.m \
|
||||
PlayerEntity.m \
|
||||
PlayerEntityContracts.m \
|
||||
PlayerEntityControls.m \
|
||||
PlayerEntityLegacyScriptEngine.m \
|
||||
PlayerEntityLoadSave.m \
|
||||
PlayerEntityScriptMethods.m \
|
||||
PlayerEntitySound.m \
|
||||
PlayerEntityStickMapper.m \
|
||||
ProxyPlayerEntity.m \
|
||||
OOBreakPatternEntity.m \
|
||||
ShipEntity.m \
|
||||
ShipEntityAI.m \
|
||||
ShipEntityScriptMethods.m \
|
||||
SkyEntity.m \
|
||||
StationEntity.m \
|
||||
OOSunEntity.m \
|
||||
WormholeEntity.m \
|
||||
OOLightParticleEntity.m \
|
||||
OOFlasherEntity.m \
|
||||
OOExhaustPlumeEntity.m \
|
||||
OOSparkEntity.m \
|
||||
OOECMBlastEntity.m \
|
||||
OOPlanetEntity.m \
|
||||
OOPlasmaShotEntity.m \
|
||||
OOPlasmaBurstEntity.m \
|
||||
OOFlashEffectEntity.m \
|
||||
ShipEntityLoadRestore.m \
|
||||
OOLaserShotEntity.m \
|
||||
OOQuiriumCascadeEntity.m \
|
||||
OORingEffectEntity.m
|
||||
|
||||
OOLITE_GRAPHICS_DRAWABLE_FILES = \
|
||||
OODrawable.m \
|
||||
OOPlanetDrawable.m \
|
||||
OOMesh.m
|
||||
OODrawable.m \
|
||||
OOPlanetDrawable.m \
|
||||
OOMesh.m
|
||||
|
||||
OOLITE_GRAPHICS_MATERIAL_FILES = \
|
||||
OOMaterialSpecifier.m \
|
||||
OOBasicMaterial.m \
|
||||
OOMaterial.m \
|
||||
OONullTexture.m \
|
||||
OOPlanetTextureGenerator.m \
|
||||
OOPNGTextureLoader.m \
|
||||
OOShaderMaterial.m \
|
||||
OOShaderProgram.m \
|
||||
OOShaderUniform.m \
|
||||
OOShaderUniformMethodType.m \
|
||||
OOSingleTextureMaterial.m \
|
||||
OOTexture.m \
|
||||
OOConcreteTexture.m \
|
||||
OOTextureGenerator.m \
|
||||
OOTextureLoader.m \
|
||||
OOPixMap.m \
|
||||
OOTextureScaling.m \
|
||||
OOPixMapChannelOperations.m \
|
||||
OOMultiTextureMaterial.m \
|
||||
OOMaterialConvenienceCreators.m \
|
||||
OOCombinedEmissionMapGenerator.m \
|
||||
OOPixMapTextureLoader.m
|
||||
OOMaterialSpecifier.m \
|
||||
OOBasicMaterial.m \
|
||||
OOMaterial.m \
|
||||
OONullTexture.m \
|
||||
OOPlanetTextureGenerator.m \
|
||||
OOPNGTextureLoader.m \
|
||||
OOShaderMaterial.m \
|
||||
OOShaderProgram.m \
|
||||
OOShaderUniform.m \
|
||||
OOShaderUniformMethodType.m \
|
||||
OOSingleTextureMaterial.m \
|
||||
OOTexture.m \
|
||||
OOConcreteTexture.m \
|
||||
OOTextureGenerator.m \
|
||||
OOTextureLoader.m \
|
||||
OOPixMap.m \
|
||||
OOTextureScaling.m \
|
||||
OOPixMapChannelOperations.m \
|
||||
OOMultiTextureMaterial.m \
|
||||
OOMaterialConvenienceCreators.m \
|
||||
OOCombinedEmissionMapGenerator.m \
|
||||
OOPixMapTextureLoader.m
|
||||
|
||||
OOLITE_GRAPHICS_MISC_FILES = \
|
||||
OOCrosshairs.m \
|
||||
OODebugGLDrawing.m \
|
||||
OOGraphicsResetManager.m \
|
||||
OOOpenGL.m \
|
||||
OOOpenGLExtensionManager.m \
|
||||
OOProbabilisticTextureManager.m \
|
||||
OOSkyDrawable.m \
|
||||
OOTextureSprite.m \
|
||||
OOPolygonSprite.m \
|
||||
OOConvertCubeMapToLatLong.m
|
||||
OOCrosshairs.m \
|
||||
OODebugGLDrawing.m \
|
||||
OOGraphicsResetManager.m \
|
||||
OOOpenGL.m \
|
||||
OOOpenGLExtensionManager.m \
|
||||
OOProbabilisticTextureManager.m \
|
||||
OOSkyDrawable.m \
|
||||
OOTextureSprite.m \
|
||||
OOPolygonSprite.m \
|
||||
OOConvertCubeMapToLatLong.m
|
||||
|
||||
OOLITE_MATHS_FILES = \
|
||||
CollisionRegion.m \
|
||||
Geometry.m \
|
||||
Octree.m \
|
||||
OOFastArithmetic.m \
|
||||
OOMatrix.m \
|
||||
OOQuaternion.m \
|
||||
OOVector.m \
|
||||
OOVoxel.m
|
||||
CollisionRegion.m \
|
||||
Geometry.m \
|
||||
Octree.m \
|
||||
OOFastArithmetic.m \
|
||||
OOMatrix.m \
|
||||
OOQuaternion.m \
|
||||
OOVector.m \
|
||||
OOVoxel.m
|
||||
|
||||
OOLITE_OXP_VERIFIER_FILES = \
|
||||
OOAIStateMachineVerifierStage.m \
|
||||
OOCheckDemoShipsPListVerifierStage.m \
|
||||
OOCheckEquipmentPListVerifierStage.m \
|
||||
OOCheckRequiresPListVerifierStage.m \
|
||||
OOCheckShipDataPListVerifierStage.m \
|
||||
OOFileScannerVerifierStage.m \
|
||||
OOModelVerifierStage.m \
|
||||
OOOXPVerifier.m \
|
||||
OOOXPVerifierStage.m \
|
||||
OOPListSchemaVerifier.m \
|
||||
OOTextureVerifierStage.m
|
||||
OOAIStateMachineVerifierStage.m \
|
||||
OOCheckDemoShipsPListVerifierStage.m \
|
||||
OOCheckEquipmentPListVerifierStage.m \
|
||||
OOCheckRequiresPListVerifierStage.m \
|
||||
OOCheckShipDataPListVerifierStage.m \
|
||||
OOFileScannerVerifierStage.m \
|
||||
OOModelVerifierStage.m \
|
||||
OOOXPVerifier.m \
|
||||
OOOXPVerifierStage.m \
|
||||
OOPListSchemaVerifier.m \
|
||||
OOTextureVerifierStage.m
|
||||
|
||||
OOLITE_RSRC_MGMT_FILES = \
|
||||
OldSchoolPropertyListWriting.m \
|
||||
OOCache.m \
|
||||
OOCacheManager.m \
|
||||
OOConvertSystemDescriptions.m \
|
||||
OOPListParsing.m \
|
||||
ResourceManager.m \
|
||||
TextureStore.m
|
||||
OldSchoolPropertyListWriting.m \
|
||||
OOCache.m \
|
||||
OOCacheManager.m \
|
||||
OOConvertSystemDescriptions.m \
|
||||
OOPListParsing.m \
|
||||
ResourceManager.m \
|
||||
TextureStore.m
|
||||
|
||||
OOLITE_SCRIPTING_FILES = \
|
||||
EntityOOJavaScriptExtensions.m \
|
||||
OOJavaScriptEngine.m \
|
||||
OOJSEngineTimeManagement.m \
|
||||
OOJSEngineDebuggerHelpers.m \
|
||||
OOConstToJSString.m \
|
||||
OOJSCall.m \
|
||||
OOJSClock.m \
|
||||
OOJSEntity.m \
|
||||
OOJSEquipmentInfo.m \
|
||||
OOJSFunction.m \
|
||||
OOJSGlobal.m \
|
||||
OOJSManifest.m \
|
||||
OOJSMission.m \
|
||||
OOJSMissionVariables.m \
|
||||
OOJSOolite.m \
|
||||
OOJSPlanet.m \
|
||||
OOJSPlayer.m \
|
||||
OOJSPlayerShip.m \
|
||||
OOJSQuaternion.m \
|
||||
OOJSScript.m \
|
||||
OOJSShip.m \
|
||||
OOJSShipGroup.m \
|
||||
OOJSSound.m \
|
||||
OOJSSoundSource.m \
|
||||
OOJSSpecialFunctions.m \
|
||||
OOJSStation.m \
|
||||
OOJSSun.m \
|
||||
OOJSSystem.m \
|
||||
OOJSSystemInfo.m \
|
||||
OOJSTimer.m \
|
||||
OOJSVector.m \
|
||||
OOJSWorldScripts.m \
|
||||
OOLegacyScriptWhitelist.m \
|
||||
OOPListScript.m \
|
||||
OOScript.m \
|
||||
OOScriptTimer.m \
|
||||
OOJSFrameCallbacks.m \
|
||||
OOJSFont.m
|
||||
EntityOOJavaScriptExtensions.m \
|
||||
OOJavaScriptEngine.m \
|
||||
OOJSEngineTimeManagement.m \
|
||||
OOJSEngineDebuggerHelpers.m \
|
||||
OOConstToJSString.m \
|
||||
OOJSCall.m \
|
||||
OOJSClock.m \
|
||||
OOJSEntity.m \
|
||||
OOJSEquipmentInfo.m \
|
||||
OOJSFunction.m \
|
||||
OOJSGlobal.m \
|
||||
OOJSManifest.m \
|
||||
OOJSMission.m \
|
||||
OOJSMissionVariables.m \
|
||||
OOJSOolite.m \
|
||||
OOJSPlanet.m \
|
||||
OOJSPlayer.m \
|
||||
OOJSPlayerShip.m \
|
||||
OOJSQuaternion.m \
|
||||
OOJSScript.m \
|
||||
OOJSShip.m \
|
||||
OOJSShipGroup.m \
|
||||
OOJSSound.m \
|
||||
OOJSSoundSource.m \
|
||||
OOJSSpecialFunctions.m \
|
||||
OOJSStation.m \
|
||||
OOJSSun.m \
|
||||
OOJSSystem.m \
|
||||
OOJSSystemInfo.m \
|
||||
OOJSTimer.m \
|
||||
OOJSVector.m \
|
||||
OOJSWorldScripts.m \
|
||||
OOLegacyScriptWhitelist.m \
|
||||
OOPListScript.m \
|
||||
OOScript.m \
|
||||
OOScriptTimer.m \
|
||||
OOJSFrameCallbacks.m \
|
||||
OOJSFont.m
|
||||
|
||||
OOLITE_SOUND_FILES = \
|
||||
OOBasicSoundReferencePoint.m \
|
||||
OOMusicController.m \
|
||||
OOSDLConcreteSound.m \
|
||||
OOSDLSound.m \
|
||||
OOSDLSoundChannel.m \
|
||||
OOSDLSoundMixer.m \
|
||||
OOSoundSource.m \
|
||||
OOSoundSourcePool.m \
|
||||
SDLMusic.m
|
||||
OOBasicSoundReferencePoint.m \
|
||||
OOMusicController.m \
|
||||
OOSDLConcreteSound.m \
|
||||
OOSDLSound.m \
|
||||
OOSDLSoundChannel.m \
|
||||
OOSDLSoundMixer.m \
|
||||
OOSoundSource.m \
|
||||
OOSoundSourcePool.m \
|
||||
SDLMusic.m
|
||||
|
||||
OOLITE_UI_FILES = \
|
||||
GuiDisplayGen.m \
|
||||
HeadUpDisplay.m \
|
||||
OOEncodingConverter.m
|
||||
GuiDisplayGen.m \
|
||||
HeadUpDisplay.m \
|
||||
OOEncodingConverter.m
|
||||
|
||||
OO_UTILITY_FILES = \
|
||||
Comparison.m \
|
||||
NSDictionaryOOExtensions.m \
|
||||
NSFileManagerOOExtensions.m \
|
||||
NSMutableDictionaryOOExtensions.m \
|
||||
NSScannerOOExtensions.m \
|
||||
NSStringOOExtensions.m \
|
||||
NSThreadOOExtensions.m \
|
||||
NSNumberOOExtensions.m \
|
||||
OOAsyncQueue.m \
|
||||
OOAsyncWorkManager.m \
|
||||
OOCollectionExtractors.m \
|
||||
OOColor.m \
|
||||
OOConstToString.m \
|
||||
OOCPUInfo.m \
|
||||
OOEntityFilterPredicate.m \
|
||||
OOExcludeObjectEnumerator.m \
|
||||
OOFilteringEnumerator.m \
|
||||
OOIsNumberLiteral.m \
|
||||
OOLogging.m \
|
||||
OOLogHeader.m \
|
||||
OOLogOutputHandler.m \
|
||||
OOPriorityQueue.m \
|
||||
OOProbabilitySet.m \
|
||||
OOShipGroup.m \
|
||||
OOStringParsing.m \
|
||||
OOWeakReference.m \
|
||||
OOXMLExtensions.m \
|
||||
OODeepCopy.m \
|
||||
OORegExpMatcher.m \
|
||||
NSObjectOOExtensions.m
|
||||
Comparison.m \
|
||||
NSDictionaryOOExtensions.m \
|
||||
NSFileManagerOOExtensions.m \
|
||||
NSMutableDictionaryOOExtensions.m \
|
||||
NSScannerOOExtensions.m \
|
||||
NSStringOOExtensions.m \
|
||||
NSThreadOOExtensions.m \
|
||||
NSNumberOOExtensions.m \
|
||||
OOAsyncQueue.m \
|
||||
OOAsyncWorkManager.m \
|
||||
OOCollectionExtractors.m \
|
||||
OOColor.m \
|
||||
OOConstToString.m \
|
||||
OOCPUInfo.m \
|
||||
OOEntityFilterPredicate.m \
|
||||
OOExcludeObjectEnumerator.m \
|
||||
OOFilteringEnumerator.m \
|
||||
OOIsNumberLiteral.m \
|
||||
OOLogging.m \
|
||||
OOLogHeader.m \
|
||||
OOLogOutputHandler.m \
|
||||
OOPriorityQueue.m \
|
||||
OOProbabilitySet.m \
|
||||
OOShipGroup.m \
|
||||
OOStringParsing.m \
|
||||
OOWeakReference.m \
|
||||
OOXMLExtensions.m \
|
||||
OODeepCopy.m \
|
||||
OORegExpMatcher.m \
|
||||
NSObjectOOExtensions.m
|
||||
|
||||
OOLITE_MISC_FILES = \
|
||||
AI.m \
|
||||
AIGraphViz.m \
|
||||
GameController.m \
|
||||
OOJoystickManager.m \
|
||||
OOSDLJoystickManager.m \
|
||||
main.m \
|
||||
MyOpenGLView.m \
|
||||
OOCharacter.m \
|
||||
OOCocoa.m \
|
||||
OOEquipmentType.m \
|
||||
OORoleSet.m \
|
||||
OOShipRegistry.m \
|
||||
OOSpatialReference.m \
|
||||
OOTrumble.m \
|
||||
Universe.m
|
||||
AI.m \
|
||||
AIGraphViz.m \
|
||||
GameController.m \
|
||||
OOJoystickManager.m \
|
||||
OOSDLJoystickManager.m \
|
||||
main.m \
|
||||
MyOpenGLView.m \
|
||||
OOCharacter.m \
|
||||
OOCocoa.m \
|
||||
OOEquipmentType.m \
|
||||
OORoleSet.m \
|
||||
OOShipRegistry.m \
|
||||
OOSpatialReference.m \
|
||||
OOTrumble.m \
|
||||
Universe.m
|
||||
|
||||
oolite_OBJC_FILES = \
|
||||
$(OOLITE_DEBUG_FILES) \
|
||||
$(OOLITE_ENTITY_FILES) \
|
||||
$(OOLITE_GRAPHICS_DRAWABLE_FILES) \
|
||||
$(OOLITE_GRAPHICS_MATERIAL_FILES) \
|
||||
$(OOLITE_GRAPHICS_MISC_FILES) \
|
||||
$(OOLITE_MATHS_FILES) \
|
||||
$(OOLITE_OXP_VERIFIER_FILES) \
|
||||
$(OOLITE_RSRC_MGMT_FILES) \
|
||||
$(OOLITE_SCRIPTING_FILES) \
|
||||
$(OOLITE_SOUND_FILES) \
|
||||
$(OOLITE_UI_FILES) \
|
||||
$(OO_UTILITY_FILES) \
|
||||
$(OOLITE_MISC_FILES)
|
||||
$(OOLITE_DEBUG_FILES) \
|
||||
$(OOLITE_ENTITY_FILES) \
|
||||
$(OOLITE_GRAPHICS_DRAWABLE_FILES) \
|
||||
$(OOLITE_GRAPHICS_MATERIAL_FILES) \
|
||||
$(OOLITE_GRAPHICS_MISC_FILES) \
|
||||
$(OOLITE_MATHS_FILES) \
|
||||
$(OOLITE_OXP_VERIFIER_FILES) \
|
||||
$(OOLITE_RSRC_MGMT_FILES) \
|
||||
$(OOLITE_SCRIPTING_FILES) \
|
||||
$(OOLITE_SOUND_FILES) \
|
||||
$(OOLITE_UI_FILES) \
|
||||
$(OO_UTILITY_FILES) \
|
||||
$(OOLITE_MISC_FILES)
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/objc.make
|
||||
include GNUmakefile.postamble
|
||||
|
|
|
|||
59
Makefile
59
Makefile
|
|
@ -1,3 +1,5 @@
|
|||
include config.make
|
||||
|
||||
# Build version string, taking into account that 'VER_REV' may not be set
|
||||
VERSION := $(strip $(shell cat src/Cocoa/oolite-version.xcconfig | cut -d '=' -f 2))
|
||||
VER_MAJ := $(shell echo "${VERSION}" | cut -d '.' -f 1)
|
||||
|
|
@ -13,7 +15,7 @@ DEB_VER := $(shell echo "${VER_MAJ}.${VER_MIN}")
|
|||
else
|
||||
DEB_VER := $(shell echo "${VER_MAJ}.${VER_MIN}.${VER_REV}")
|
||||
endif
|
||||
DEB_REV := $(shell cat debian/revision)
|
||||
DEB_REV := $(shell cat debian/revision)
|
||||
# Ubuntu versions are: <upstream version>-<deb ver>ubuntu<build ver>
|
||||
# eg: oolite1.74.4.2755-0ubuntu1
|
||||
# Oolite versions are: MAJ.min.rev.svn
|
||||
|
|
@ -23,26 +25,16 @@ DEB_REV := $(shell cat debian/revision)
|
|||
pkg-debtest: DEB_REV := $(shell echo "0~test${DEB_REV}")
|
||||
pkg-debsnapshot: DEB_REV := $(shell echo "0~trunk${DEB_REV}")
|
||||
|
||||
LIBJS_SRC_DIR=deps/Cross-platform-deps/SpiderMonkey/js/src
|
||||
|
||||
ifeq ($(GNUSTEP_HOST_OS),mingw32)
|
||||
LIBJS=deps/Windows-x86-deps/DLLs/js32ECMAv5.dll
|
||||
LIBJS = deps/Windows-x86-deps/DLLs/js32ECMAv5.dll
|
||||
LIBJS_DBG = deps/Windows-x86-deps/DLLs/js32ECMAv5.dll
|
||||
DEPS=$(LIBJS)
|
||||
DEPS_DBG=$(LIBJS_DBG)
|
||||
else
|
||||
DEPS=LIBJS
|
||||
DEPS_DBG=LIBJS_DBG
|
||||
endif
|
||||
|
||||
ifeq ($(GNUSTEP_HOST_OS),linux-gnu)
|
||||
# These are the paths for our custom-built Javascript library
|
||||
LIBJS_INC_DIR=$(LIBJS_SRC_DIR)
|
||||
ifeq ($(JS_OPT),no)
|
||||
LIBJS_BIN_DIR=$(LIBJS_SRC_DIR)/Linux_All_DBG.OBJ
|
||||
LIBJS_BUILD_FLAGS=
|
||||
else
|
||||
LIBJS_BIN_DIR=$(LIBJS_SRC_DIR)/Linux_All_OPT.OBJ
|
||||
LIBJS_BUILD_FLAGS=BUILD_OPT=1
|
||||
endif
|
||||
LIBJS=$(LIBJS_BIN_DIR)/libjs.a
|
||||
endif
|
||||
|
||||
DEPS=$(LIBJS)
|
||||
|
||||
# define autopackage .apspec file according to the CPU architecture
|
||||
HOST_ARCH := $(shell echo $(GNUSTEP_HOST_CPU) | sed -e s/i.86/i386/ -e s/amd64/x86_64/ )
|
||||
|
|
@ -55,7 +47,7 @@ endif
|
|||
# Here are our default targets
|
||||
#
|
||||
.PHONY: debug
|
||||
debug: $(DEPS)
|
||||
debug: $(DEPS_DBG)
|
||||
make -f GNUmakefile debug=yes
|
||||
|
||||
.PHONY: release
|
||||
|
|
@ -72,7 +64,7 @@ release-snapshot: $(DEPS)
|
|||
|
||||
# Here are targets using the provided dependencies
|
||||
.PHONY: deps-debug
|
||||
deps-debug: $(DEPS)
|
||||
deps-debug: $(DEPS_DBG)
|
||||
make -f GNUmakefile debug=yes use_deps=yes
|
||||
|
||||
.PHONY: deps-release
|
||||
|
|
@ -87,25 +79,30 @@ deps-release-deployment: $(DEPS)
|
|||
deps-release-snapshot: $(DEPS)
|
||||
make -f GNUmakefile SNAPSHOT_BUILD=yes VERSION_STRING=$(VER) debug=no use_deps=yes
|
||||
|
||||
$(LIBJS):
|
||||
.PHONY: LIBJS_DBG
|
||||
LIBJS_DBG:
|
||||
ifeq ($(GNUSTEP_HOST_OS),mingw32)
|
||||
@echo "ERROR - this Makefile can't (yet) build the Javascript DLL"
|
||||
@echo " Please build it yourself and copy it to $(LIBJS_DBG)."
|
||||
false
|
||||
endif
|
||||
make -f libjs.make debug=yes
|
||||
|
||||
.PHONY: LIBJS
|
||||
LIBJS:
|
||||
ifeq ($(GNUSTEP_HOST_OS),mingw32)
|
||||
@echo "ERROR - this Makefile can't (yet) build the Javascript DLL"
|
||||
@echo " Please build it yourself and copy it to $(LIBJS)."
|
||||
false
|
||||
endif
|
||||
# When Linux is ready to compile the Javascript engine from source
|
||||
# then re-activate the following line of code and update it appropriately
|
||||
# make -C $(LIBJS_SRC_DIR) -f Makefile.ref $(LIBJS_BUILD_FLAGS)
|
||||
make -f libjs.make debug=no
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
# When Linux is ready to compile the Javascript engine from source
|
||||
# then re-activate the following block of code and update it appropriately
|
||||
# ifneq ($(GNUSTEP_HOST_OS),mingw32)
|
||||
# make -C $(LIBJS_SRC_DIR)/editline -f Makefile.ref clobber
|
||||
# make -C $(LIBJS_SRC_DIR) -f Makefile.ref clobber
|
||||
# find $(LIBJS_SRC_DIR) -name "Linux_All_*.OBJ" | xargs rm -Rf
|
||||
# endif
|
||||
ifneq ($(GNUSTEP_HOST_OS),mingw32)
|
||||
make -f libjs.make clean debug=yes
|
||||
make -f libjs.make clean debug=no
|
||||
endif
|
||||
make -f GNUmakefile clean
|
||||
rm -Rf obj obj.dbg oolite.app
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
#
|
||||
# This file contains makefile configuration options for Oolite builds
|
||||
#
|
||||
# This file is sourced by both GNUmakefile and Makefile
|
||||
#
|
||||
# Any options can be overridden on the command-line:
|
||||
# $ make debug=yes DOCKING_CLEARANCE=no
|
||||
# $ make -f Makefile LIBJS_OPT=yes
|
||||
#
|
||||
|
||||
VERBOSE = yes
|
||||
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
|
||||
ESPEAK = yes
|
||||
OO_CHECK_GL_HEAVY = no
|
||||
OO_EXCLUDE_DEBUG_SUPPORT = no
|
||||
OO_OXP_VERIFIER_ENABLED = yes
|
||||
OO_LOCALIZATION_TOOLS = yes
|
||||
DEBUG_GRAPHVIZ = yes
|
||||
OO_JAVASCRIPT_TRACE = yes
|
||||
|
|
@ -6,7 +6,7 @@ Standards-Version: 3.8.0
|
|||
Build-Depends: debhelper (>= 5),
|
||||
libsdl1.2-dev, libsdl-mixer1.2-dev, libespeak-dev,
|
||||
libgnustep-base-dev, gnustep-core-devel,
|
||||
libpng-dev, mesa-common-dev
|
||||
libpng-dev, mesa-common-dev, libnspr4-dev
|
||||
Homepage: http://oolite.org/
|
||||
Vcs-Svn: svn://svn.berlios.de/oolite-linux
|
||||
Vcs-Browser: http://svn.berlios.de/wsvn/oolite-linux
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@ Doc/PORTING.TXT
|
|||
Doc/README_LINUX.TXT
|
||||
Doc/ReadMe.rtfd/TXT.rtf
|
||||
oolite.*/Resources/README.TXT
|
||||
deps/Linux-deps/PLAYING.TXT
|
||||
Doc/AdviceForNewCommanders.pdf
|
||||
Doc/OoliteRS.pdf
|
||||
Doc/contributors.txt
|
||||
|
|
|
|||
|
|
@ -8,43 +8,48 @@
|
|||
# Re-written by Darren Salt
|
||||
# Tweaked by Michael Werle
|
||||
|
||||
GSMAKE = gs_make
|
||||
JS_SRC = deps/Cross-platform-deps/SpiderMonkey/js/src
|
||||
GSMAKE = gs_make
|
||||
GSMAKE_FLAGS = use_deps=no libespeak=yes
|
||||
UPDATE_SCRIPTS_DIR = deps/Cocoa-deps/scripts
|
||||
LIBJS_BUILD_DIR = deps/Cross-platform-deps/mozilla/js/src/build-release
|
||||
|
||||
CFLAGS += -g
|
||||
CFLAGS += -g
|
||||
ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
|
||||
CFLAGS += -O2
|
||||
GSMAKE += debug=no
|
||||
override EXT =
|
||||
CFLAGS += -O2
|
||||
GSMAKE_FLAGS += debug=no OO_JAVASCRIPT_TRACE=no
|
||||
override EXT =
|
||||
else
|
||||
CFLAGS += -O0
|
||||
GSMAKE += debug=yes
|
||||
override EXT = .dbg
|
||||
CFLAGS += -O0
|
||||
GSMAKE_FLAGS += debug=yes OO_JAVASCRIPT_TRACE=yes
|
||||
override EXT = .dbg
|
||||
endif
|
||||
export CFLAGS
|
||||
|
||||
export GNUSTEP_INSTALLATION_DOMAIN = SYSTEM
|
||||
|
||||
build: build-stamp
|
||||
build-stamp:
|
||||
build-stamp: build-libjs-stamp
|
||||
dh_testdir
|
||||
$(MAKE) -C $(JS_SRC)/fdlibm -f Makefile.ref BUILD_OPT=1
|
||||
$(MAKE) -C $(JS_SRC) -f Makefile.ref BUILD_OPT=1
|
||||
$(GSMAKE) libespeak=yes
|
||||
$(GSMAKE) $(GSMAKE_FLAGS)
|
||||
touch $@
|
||||
|
||||
build-libjs-stamp:
|
||||
make -f libjs.make $(GSMAKE_FLAGS)
|
||||
touch $@
|
||||
|
||||
clean: clean-stamp
|
||||
clean-stamp:
|
||||
clean-stamp: clean-libjs-stamp
|
||||
dh_testdir
|
||||
rm -f build-stamp
|
||||
$(GSMAKE) clean
|
||||
$(MAKE) -C $(JS_SRC)/fdlibm -f Makefile.ref clean
|
||||
$(MAKE) -C $(JS_SRC) -f Makefile.ref clean
|
||||
$(GSMAKE) clean $(GSMAKE_FLAGS)
|
||||
rm -rf oolite.app oolite.debug
|
||||
rm -f http+_www.apple.com_DTDs_PropertyList-1.0.dtd
|
||||
find $(JS_SRC) -name Linux_All_OPT.OBJ | xargs -r rm -rf
|
||||
dh_clean
|
||||
|
||||
clean-libjs-stamp:
|
||||
-make -f libjs.make clean $(GSMAKE_FLAGS)
|
||||
rm -f build-libjs-stamp
|
||||
|
||||
install: build
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ fi
|
|||
|
||||
# Create temp directory.
|
||||
mkdir "$TEMPDIR"
|
||||
if [ ! $? ]
|
||||
if [ "$?" -ne "0" ]
|
||||
then
|
||||
echo "error: Could not create temporary directory $TEMPDIR."
|
||||
exit 1
|
||||
|
|
@ -72,8 +72,8 @@ fi
|
|||
|
||||
# Download mozilla source.
|
||||
echo "Downloading libjs source from $DESIREDURL..."
|
||||
curl -qgsS -o "$TEMPFILE" "$DESIREDURL"
|
||||
if [ ! $? ]
|
||||
curl -qgsSf -o "$TEMPFILE" "$DESIREDURL"
|
||||
if [ "$?" -ne "0" ]
|
||||
then
|
||||
fail "could not download $DESIREDURL"
|
||||
fi
|
||||
|
|
@ -82,7 +82,7 @@ fi
|
|||
# Expand tarball.
|
||||
echo "Download complete, expanding archive..."
|
||||
tar -xkf "$TEMPFILE" -C "$TEMPDIR"
|
||||
if [ ! $? ]
|
||||
if [ "$?" -ne "0" ]
|
||||
then
|
||||
fail "could not expand $TEMPFILE into $TEMPDIR"
|
||||
fi
|
||||
|
|
@ -100,14 +100,14 @@ mkdir "$TARGETDIR"
|
|||
|
||||
# Move new code into place.
|
||||
mv "$TEMPDIR/mozilla-central/js" "$TARGETDIR/js"
|
||||
if [ ! $? ]
|
||||
if [ "$?" -ne "0" ]
|
||||
then
|
||||
echo "error: could not move expanded libjs source into place."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
mv "$TEMPDIR/mozilla-central/nsprpub" "$TARGETDIR/nsprpub"
|
||||
if [ ! $? ]
|
||||
if [ "$?" -ne "0" ]
|
||||
then
|
||||
echo "error: could not move expanded libnspr4 source into place."
|
||||
exit 1
|
||||
|
|
|
|||
|
|
@ -0,0 +1,41 @@
|
|||
#
|
||||
# This makefile is used to build the Javascript dependency for Oolite
|
||||
#
|
||||
# It can be used to make both a release Javascript library and a
|
||||
# debug library.
|
||||
include config.make
|
||||
|
||||
LIBJS_SRC_DIR = deps/Cross-platform-deps/mozilla/js/src
|
||||
LIBJS_CONFIG_FLAGS = --disable-shared-js
|
||||
LIBJS_CONFIG_FLAGS += --enable-threadsafe
|
||||
LIBJS_CONFIG_FLAGS += --with-system-nspr
|
||||
ifeq ($(OO_JAVASCRIPT_TRACE),yes)
|
||||
LIBJS_CONFIG_FLAGS += --enable-trace-jscalls
|
||||
endif
|
||||
ifeq ($(debug),yes)
|
||||
LIBJS_BUILD_DIR=$(LIBJS_SRC_DIR)/build-debug
|
||||
LIBJS_CONFIG_FLAGS += --enable-debug
|
||||
LIBJS_CONFIG_FLAGS += --disable-optimize
|
||||
LIBJS_BUILD_FLAGS =
|
||||
else
|
||||
LIBJS_BUILD_DIR = $(LIBJS_SRC_DIR)/build-release
|
||||
LIBJS_BUILD_FLAGS =
|
||||
endif
|
||||
LIBJS = $(LIBJS_BUILD_DIR)/libjs_static.a
|
||||
|
||||
$(LIBJS): LIBJS_SRC
|
||||
@echo
|
||||
@echo "Building Javascript library..."
|
||||
@echo
|
||||
cd $(LIBJS_BUILD_DIR) && ../configure $(LIBJS_CONFIG_FLAGS)
|
||||
make -C $(LIBJS_BUILD_DIR) $(LIBJS_BUILD_FLAGS)
|
||||
|
||||
.PHONY: LIBJS_SRC
|
||||
LIBJS_SRC:
|
||||
echo "Updating Javascript sources..."
|
||||
cd deps/Cocoa-deps/scripts && ./update-mozilla.sh
|
||||
mkdir -p $(LIBJS_BUILD_DIR)
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
-make -C $(LIBJS_BUILD_DIR) clean
|
||||
|
|
@ -10,6 +10,12 @@ then
|
|||
exit 255
|
||||
fi
|
||||
|
||||
if [ -e $DESTINATION/oolite-$VERSION-src.tar.gz ]; then
|
||||
echo "Source Tarball for Version $VERSION already exists"
|
||||
# TODO - query / param to continue anyway
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# clear out the cruft
|
||||
rm -rf $DESTINATION/oolite-$VERSION-src
|
||||
rm -f $DESTINATION/oolite-$VERSION-src.tar.gz
|
||||
|
|
@ -28,7 +34,7 @@ then
|
|||
exit 255
|
||||
fi
|
||||
|
||||
for i in autopackage Doc FreeDesktop installers Oolite-importer Oolite.xcodeproj OSX-SDL src tools GNUmakefile GNUmakefile.postamble README.txt
|
||||
for i in autopackage debian deps Doc FreeDesktop installers Schemata Oolite-importer Oolite.xcodeproj src tools GNUmakefile GNUmakefile.postamble Makefile README.txt contributors.txt
|
||||
do
|
||||
if ! cp -r $i $DESTINATION/oolite-$VERSION-src;
|
||||
then
|
||||
|
|
@ -43,22 +49,29 @@ then
|
|||
exit 255
|
||||
fi
|
||||
|
||||
# Save the SVN Revision number in the source tarball for the tools/mkversion script
|
||||
echo `tools/mkversion --subversion` > $DESTINATION/oolite-$VERSION-src/svnrevision
|
||||
|
||||
#echo "Press a key to continue"
|
||||
#read -s -n 1
|
||||
|
||||
cd $DESTINATION
|
||||
if ! tar zcf oolite-$VERSION-src.tar.gz oolite-$VERSION-src --exclude .svn
|
||||
mv oolite-$VERSION-src oolite-$VERSION
|
||||
if ! tar zcf oolite-$VERSION-src.tar.gz oolite-$VERSION --exclude .svn
|
||||
then
|
||||
echo "Failed to create src tarball"
|
||||
exit 255
|
||||
fi
|
||||
|
||||
# so the data tarball has the same path as src
|
||||
rm -rf oolite-$VERSION-src
|
||||
mv oolite-$VERSION-data oolite-$VERSION-src
|
||||
if ! tar zcf oolite-$VERSION-data.tar.gz oolite-$VERSION-src --exclude .svn
|
||||
rm -rf oolite-$VERSION
|
||||
mv oolite-$VERSION-data oolite-$VERSION
|
||||
if ! tar zcf oolite-$VERSION-data.tar.gz oolite-$VERSION --exclude .svn
|
||||
then
|
||||
echo "Failed to create data tarball"
|
||||
exit 255
|
||||
fi
|
||||
|
||||
rm -rf oolite-$VERSION-src
|
||||
rm -rf oolite-$VERSION
|
||||
echo "Tarballs placed in $DESTINATION."
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue