diff options
Diffstat (limited to 'rbutil/libtools.make')
-rw-r--r-- | rbutil/libtools.make | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/rbutil/libtools.make b/rbutil/libtools.make index 44ed5fef3d..de70388010 100644 --- a/rbutil/libtools.make +++ b/rbutil/libtools.make | |||
@@ -27,6 +27,8 @@ APPVERSION ?= $(shell $(TOP)/../tools/version.sh $(TOP)/..) | |||
27 | CFLAGS += -DVERSION=\""$(APPVERSION)"\" | 27 | CFLAGS += -DVERSION=\""$(APPVERSION)"\" |
28 | TARGET_DIR ?= $(abspath .)/ | 28 | TARGET_DIR ?= $(abspath .)/ |
29 | 29 | ||
30 | NATIVECC = gcc | ||
31 | CC = gcc | ||
30 | CPPDEFINES=$(shell echo foo | $(CROSS)$(CC) -dM -E -) | 32 | CPPDEFINES=$(shell echo foo | $(CROSS)$(CC) -dM -E -) |
31 | # use POSIX/C99 printf on windows | 33 | # use POSIX/C99 printf on windows |
32 | CFLAGS += -D__USE_MINGW_ANSI_STDIO=1 | 34 | CFLAGS += -D__USE_MINGW_ANSI_STDIO=1 |
@@ -44,7 +46,7 @@ COMPILETARGET = mingw | |||
44 | else | 46 | else |
45 | ifeq ($(findstring APPLE,$(CPPDEFINES)),APPLE) | 47 | ifeq ($(findstring APPLE,$(CPPDEFINES)),APPLE) |
46 | COMPILETARGET = darwin | 48 | COMPILETARGET = darwin |
47 | LDOPTS += $(LDFLAGS_OSX) | 49 | LDOPTS += $(LDOPTS_OSX) |
48 | else | 50 | else |
49 | COMPILETARGET = posix | 51 | COMPILETARGET = posix |
50 | endif | 52 | endif |
@@ -52,8 +54,6 @@ endif | |||
52 | endif | 54 | endif |
53 | $(info Compiler creates $(COMPILETARGET) binaries) | 55 | $(info Compiler creates $(COMPILETARGET) binaries) |
54 | 56 | ||
55 | NATIVECC ?= gcc | ||
56 | CC ?= gcc | ||
57 | # OS X specifics. Needs to consider cross compiling for Windows. | 57 | # OS X specifics. Needs to consider cross compiling for Windows. |
58 | ifeq ($(findstring APPLE,$(CPPDEFINES)),APPLE) | 58 | ifeq ($(findstring APPLE,$(CPPDEFINES)),APPLE) |
59 | # when building libs for OS X build for both i386 and ppc at the same time. | 59 | # when building libs for OS X build for both i386 and ppc at the same time. |
@@ -62,9 +62,9 @@ ifeq ($(findstring APPLE,$(CPPDEFINES)),APPLE) | |||
62 | CFLAGS += -arch ppc -arch i386 | 62 | CFLAGS += -arch ppc -arch i386 |
63 | # building against SDK 10.4 is not compatible with gcc-4.2 (default on newer Xcode) | 63 | # building against SDK 10.4 is not compatible with gcc-4.2 (default on newer Xcode) |
64 | # might need adjustment for older Xcode. | 64 | # might need adjustment for older Xcode. |
65 | CC ?= gcc-4.0 | 65 | CC = gcc-4.0 |
66 | CFLAGS += -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 | 66 | CFLAGS += -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 |
67 | NATIVECC ?= gcc-4.0 | 67 | NATIVECC = gcc-4.0 |
68 | endif | 68 | endif |
69 | WINDRES = windres | 69 | WINDRES = windres |
70 | 70 | ||