Merge remote-tracking branch 'origin/master' into dev

Author: Alexander Widerberg

README.md

@@ -36,9 +36,9 @@ This will build and install the library for the given IOS_PLATFORM.
 
 * Set `-DPLATFORM` to "SIMULATOR" to build for iOS simulator 32 bit (i386) **DEPRECATED**
 * Set `-DPLATFORM` to "SIMULATOR64" (example above) to build for iOS simulator 64 bit (x86_64)
-* Set `-DPLATFORM` to "OS" to build for Device (armv7, armv7s, arm64, arm64e)
-* Set `-DPLATFORM` to "OS64" to build for Device (arm64, arm64e)
-* Set `-DPLATFORM` to "OS64COMBINED" to build for Device & Simulator (FAT lib) (arm64, arm64e, x86_64)
+* Set `-DPLATFORM` to "OS" to build for Device (armv7, armv7s, arm64)
+* Set `-DPLATFORM` to "OS64" to build for Device (arm64)
+* Set `-DPLATFORM` to "OS64COMBINED" to build for Device & Simulator (FAT lib) (arm64, x86_64)
 * Set `-DPLATFORM` to "TVOS" to build for tvOS (arm64)
 * Set `-DPLATFORM` to "TVOSCOMBINED" to build for tvOS & Simulator (arm64, x86_64)
 * Set `-DPLATFORM` to "SIMULATOR_TVOS" to build for tvOS Simulator (x86_64)
@@ -60,7 +60,7 @@ usage of the library much more simple!
 
 `-DENABLE_VISIBILITY=(BOOL)` - Disabled by default, specify TRUE or 1 to enable symbol visibility support
 
-`-DIOS_ARCH=(STRING)` - Valid values are: armv7, armv7s, arm64, arm64e, i386, x86_64, armv7k, arm64_32. By default it will build for all valid architectures based on `-DPLATFORM` (see above)
+`-DIOS_ARCH=(STRING)` - Valid values are: armv7, armv7s, arm64, i386, x86_64, armv7k, arm64_32. By default it will build for all valid architectures based on `-DPLATFORM` (see above)
 
 __*To combine all platforms into the same FAT-library, either build any of the "*COMBINED*" platform types OR use the 
 LIPO tool. More information on how to combine libraries with LIPO is readily available on the net.*__