summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rbutil/libtools.make16
1 files changed, 6 insertions, 10 deletions
diff --git a/rbutil/libtools.make b/rbutil/libtools.make
index 227d61b7d4..d25a97127c 100644
--- a/rbutil/libtools.make
+++ b/rbutil/libtools.make
@@ -23,11 +23,9 @@ endif
23TOP := $(dir $(lastword $(MAKEFILE_LIST))) 23TOP := $(dir $(lastword $(MAKEFILE_LIST)))
24 24
25# overwrite for releases 25# overwrite for releases
26ifndef APPVERSION 26APPVERSION ?= $(shell $(TOP)/../tools/version.sh ../)
27APPVERSION=$(shell $(TOP)/../tools/version.sh ../)
28endif
29CFLAGS += -DVERSION=\"$(APPVERSION)\" 27CFLAGS += -DVERSION=\"$(APPVERSION)\"
30TARGET_DIR = $(shell pwd)/ 28TARGET_DIR ?= $(shell pwd)/
31 29
32BINARY = $(OUTPUT) 30BINARY = $(OUTPUT)
33# when building a Windows binary add the correct file suffix 31# when building a Windows binary add the correct file suffix
@@ -45,19 +43,17 @@ endif
45endif 43endif
46 44
47NATIVECC = gcc 45NATIVECC = gcc
48CC = gcc 46CC ?= gcc
49ifeq ($(findstring Darwin,$(shell uname)),Darwin) 47ifeq ($(findstring Darwin,$(shell uname)),Darwin)
50# building against SDK 10.4 is not compatible with gcc-4.2 (default on newer Xcode) 48# building against SDK 10.4 is not compatible with gcc-4.2 (default on newer Xcode)
51# might need adjustment for older Xcode. 49# might need adjustment for older Xcode.
52CC = gcc-4.0 50CC ?= gcc-4.0
53CFLAGS += -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 51CFLAGS += -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4
54NATIVECC = gcc-4.0 52NATIVECC ?= gcc-4.0
55endif 53endif
56WINDRES = windres 54WINDRES = windres
57 55
58ifndef BUILD_DIR 56BUILD_DIR ?= $(TARGET_DIR)build
59BUILD_DIR = $(TARGET_DIR)build
60endif
61OBJDIR = $(abspath $(BUILD_DIR)/$(RBARCH))/ 57OBJDIR = $(abspath $(BUILD_DIR)/$(RBARCH))/
62 58
63ifdef RBARCH 59ifdef RBARCH