addd6022a2
Config diverted from u8500_defconfig config OBS-URL: https://build.opensuse.org/request/show/141519 OBS-URL: https://build.opensuse.org/package/show/games/angelscript?expand=0&rev=3
55 lines
2.3 KiB
Diff
55 lines
2.3 KiB
Diff
diff -Naur sdk.orig/angelscript/projects/gnuc/makefile sdk/angelscript/projects/gnuc/makefile
|
|
--- sdk.orig/angelscript/projects/gnuc/makefile 2012-02-03 20:37:58.000000000 +0100
|
|
+++ sdk/angelscript/projects/gnuc/makefile 2012-11-15 23:12:36.000000000 +0100
|
|
@@ -21,13 +21,13 @@
|
|
OBJDIR = obj-iphone
|
|
LIBDIR = ../../lib-iphone
|
|
CXX = $(IPHONEBIN)/clang++
|
|
- CXXFLAGS += -O2 -Wall -fPIC -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.0.sdk -miphoneos-version-min=3.0
|
|
+ my_CXXFLAGS += -O2 -Wall -fPIC -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.0.sdk -miphoneos-version-min=3.0
|
|
else ifeq ($(TARGETPLATFORM), iphonesimulator)
|
|
IPHONEBIN = /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin
|
|
OBJDIR = obj-iphone
|
|
LIBDIR = ../../lib-iphone
|
|
CXX = $(IPHONEBIN)/clang++
|
|
- CXXFLAGS += -O2 -Wall -fPIC -arch i386 -isysroot /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.0.sdk -miphoneos-version-min=3.0
|
|
+ my_CXXFLAGS += -O2 -Wall -fPIC -arch i386 -isysroot /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.0.sdk -miphoneos-version-min=3.0
|
|
else ifeq ($(TARGETPLATFORM), android)
|
|
ANDROIDNDKROOT = /cygdrive/c/android/android-ndk-1.6_r1
|
|
ANDROIDBIN = $(ANDROIDNDKROOT)/build/prebuilt/windows/arm-eabi-4.2.1/bin
|
|
@@ -35,7 +35,7 @@
|
|
OBJDIR = obj-android
|
|
LIBDIR = ../../lib-android
|
|
CXX = $(ANDROIDBIN)/arm-eabi-gcc
|
|
- CXXFLAGS += -g -Wall -I$(SYSROOT)/usr/include \
|
|
+ my_CXXFLAGS += -g -Wall -I$(SYSROOT)/usr/include \
|
|
-Wall \
|
|
-DANDROID \
|
|
-fno-exceptions \
|
|
@@ -47,7 +47,7 @@
|
|
CXX ?= gcc
|
|
# On i686 architecture you may need to add -march=i686 if you get
|
|
# an undefined symbol for __sync_sub_and_fetch_4 in as_atomic.cpp.
|
|
- CXXFLAGS += -g -Wall -fPIC -fno-strict-aliasing
|
|
+ my_CXXFLAGS += -g -Wall -fPIC -fno-strict-aliasing
|
|
endif
|
|
|
|
AR ?= ar
|
|
@@ -122,13 +122,13 @@
|
|
mkdir $(LIBDIR)
|
|
|
|
$(OBJDIR)/%.o: $(SRCDIR)/%.cpp
|
|
- $(CXX) $(CXXFLAGS) -o $@ -c $<
|
|
+ $(CXX) $(my_CXXFLAGS) $(CXXFLAGS) -o $@ -c $<
|
|
|
|
$(OBJDIR)/%.o: $(SRCDIR)/%.S
|
|
- $(CXX) $(CXXFLAGS) -o $@ -c $<
|
|
+ $(CXX) $(my_CXXFLAGS) $(CXXFLAGS) -o $@ -c $<
|
|
|
|
$(OBJDIR)/%.o: $(SRCDIR)/%.s
|
|
- $(CXX) $(CXXFLAGS) -o $@ -c $<
|
|
+ $(CXX) $(my_CXXFLAGS) $(CXXFLAGS) -o $@ -c $<
|
|
|
|
|
|
clean:
|