Skip to content

C
core
Kaydet (Commit) 9fec8749 authored tarafından Tor Lillqvist's avatar Tor Lillqvist
Dosyalara gözat
Seçenekler

Use gb_OBJCXXFLAGS for iOS, too

üst 543389de
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
vcl/Library_vcl.mk
Dosyayı görüntüle @ 9fec8749
...@@ -236,9 +236,8 @@ $(eval $(call gb_Library_add_nativeres,vcl,src)) ...@@ -236,9 +236,8 @@ $(eval $(call gb_Library_add_nativeres,vcl,src))
endif endif
ifeq ($(GUIBASE),cocoatouch) ifeq ($(GUIBASE),cocoatouch)
$(eval $(call gb_Library_set_cxxflags,vcl,\ $(eval $(call gb_Library_add_cxxflags,vcl,\
$$(CXXFLAGS) \ $(gb_OBJCXXFLAGS) \
$$(OBJCXXFLAGS) \
)) ))
$(eval $(call gb_Library_add_objcxxobjects,vcl,\ $(eval $(call gb_Library_add_objcxxobjects,vcl,\
vcl/ios/source/app/salnstimer \ vcl/ios/source/app/salnstimer \
......
vcl/StaticLibrary_vclmain.mk
Dosyayı görüntüle @ 9fec8749
...@@ -28,9 +28,8 @@ ...@@ -28,9 +28,8 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,vclmain)) $(eval $(call gb_StaticLibrary_StaticLibrary,vclmain))
ifeq ($(OS),IOS) ifeq ($(OS),IOS)
$(eval $(call gb_StaticLibrary_set_cxxflags,vclmain,\ $(eval $(call gb_StaticLibrary_add_cxxflags,vclmain,\
$$(CXXFLAGS) \ $(gb_OBJCXXFLAGS) \
-x objective-c++ -fobjc-abi-version=2 -fobjc-legacy-dispatch -D__IPHONE_OS_VERSION_MIN_REQUIRED=40300 \
)) ))
endif endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment