Merge 6857c82 into bb78b7e

spotify · Feb 8, 2016 · edfcb4d · edfcb4d
2 parents bb78b7e + 6857c82
commit edfcb4d
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/spotify_os.xcconfig b/spotify_os.xcconfig
@@ -6,18 +6,25 @@ IPHONEOS_DEPLOYMENT_TARGET = 7.0
 WATCHOS_DEPLOYMENT_TARGET = 2.0
 TVOS_DEPLOYMENT_TARGET = 9.0
 MACOSX_DEPLOYMENT_TARGET = 10.8
+
 ENABLE_NS_ASSERTIONS_Debug = YES
 ENABLE_NS_ASSERTIONS_Release = NO
+ENABLE_NS_ASSERTIONS = $(ENABLE_NS_ASSERTIONS_$(CONFIGURATION))
+
 ONLY_ACTIVE_ARCH_Debug = YES
 ONLY_ACTIVE_ARCH_Release = NO
 ONLY_ACTIVE_ARCH = $(ONLY_ACTIVE_ARCH_$(CONFIGURATION))
+
 SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator watchsimulator appletvsimulator
+
+CLANG_ENABLE_MODULES = YES
 CLANG_MODULES_AUTOLINK = NO
-INSTALL_PATH=@rpath
-DYLIB_INSTALL_NAME_BASE=@rpath
-LD_RUNPATH_SEARCH_PATHS=$(inherited) @executable_path/Frameworks @loader_path/Frameworks
 
-// Language standards
+INSTALL_PATH = @rpath
+DYLIB_INSTALL_NAME_BASE = @rpath
+LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
+
+// Spotify language and std-library standards
 GCC_C_LANGUAGE_STANDARD = gnu99
 CLANG_CXX_LANGUAGE_STANDARD = c++11
 CLANG_CXX_LIBRARY = libc++