Skip to content

Commit

Permalink
Merge pull request assimp#251 from jmas-ogawa/pr-work
Browse files Browse the repository at this point in the history
Fixed half-width from the full-width double quotes.
  • Loading branch information
kimkulling committed Apr 15, 2014
2 parents a6044e1 + da1c9e8 commit 85b756a
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions port/iOS/IPHONEOS_ARM64_TOOLCHAIN.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ INCLUDE(CMakeForceCompiler)

SET (CMAKE_CROSSCOMPILING TRUE)
SET (CMAKE_SYSTEM_NAME "Darwin")
SET (CMAKE_SYSTEM_PROCESSOR "arm64)
SET (CMAKE_SYSTEM_PROCESSOR "arm64")

SET (SDKVER 7.1)
SET (SDKVER "7.1")
SET (DEVROOT "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain")
SET (SDKROOT "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS${SDKVER}.sdk")
SET (CC "${DEVROOT}/usr/bin/llvm-gcc")
Expand Down
4 changes: 2 additions & 2 deletions port/iOS/IPHONEOS_ARMV6_TOOLCHAIN.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ SET (CMAKE_CROSSCOMPILING TRUE)
SET (CMAKE_SYSTEM_NAME "Darwin")
SET (CMAKE_SYSTEM_PROCESSOR "armv6")

SET (SDKVER 7.1)
SET (SDKVER "7.1")
SET (DEVROOT "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain")
SET (SDKROOT "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS${SDKVER}.sdk")
SET (CC "${DEVROOT}/usr/bin/clang)
SET (CC "${DEVROOT}/usr/bin/clang")
SET (CXX "${DEVROOT}/usr/bin/clang++")

CMAKE_FORCE_C_COMPILER (${CC} LLVM)
Expand Down
6 changes: 3 additions & 3 deletions port/iOS/IPHONEOS_ARMV7S_TOOLCHAIN.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ INCLUDE(CMakeForceCompiler)

SET (CMAKE_CROSSCOMPILING TRUE)
SET (CMAKE_SYSTEM_NAME "Darwin")
SET (CMAKE_SYSTEM_PROCESSOR "armv7s)
SET (CMAKE_SYSTEM_PROCESSOR "armv7s")

SET (SDKVER 7.1)
SET (SDKVER "7.1")
SET (DEVROOT "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain")
SET (SDKROOT "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS${SDKVER}.sdk")
SET (CC "${DEVROOT}/usr/bin/clang)
SET (CC "${DEVROOT}/usr/bin/clang")
SET (CXX "${DEVROOT}/usr/bin/clang++")

CMAKE_FORCE_C_COMPILER (${CC} LLVM)
Expand Down
4 changes: 2 additions & 2 deletions port/iOS/IPHONEOS_ARMV7_TOOLCHAIN.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ SET (CMAKE_CROSSCOMPILING TRUE)
SET (CMAKE_SYSTEM_NAME "Darwin")
SET (CMAKE_SYSTEM_PROCESSOR "armv7")

SET (SDKVER 7.1)
SET (SDKVER "7.1")
SET (DEVROOT "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain")
SET (SDKROOT "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS${SDKVER}.sdk")
SET (CC "${DEVROOT}/usr/bin/clang)
SET (CC "${DEVROOT}/usr/bin/clang")
SET (CXX "${DEVROOT}/usr/bin/clang++")

CMAKE_FORCE_C_COMPILER (${CC} LLVM)
Expand Down
6 changes: 3 additions & 3 deletions port/iOS/IPHONEOS_I386_TOOLCHAIN.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ INCLUDE(CMakeForceCompiler)

SET (CMAKE_CROSSCOMPILING TRUE)
SET (CMAKE_SYSTEM_NAME "Darwin")
SET (CMAKE_SYSTEM_PROCESSOR i386)
SET (CMAKE_SYSTEM_PROCESSOR "i386")

SET (SDKVER 7.1)
SET (SDKVER "7.1")

SET (DEVROOT "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain")
SET (SDKROOT "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${SDKVER}.sdk")
SET (CC "${DEVROOT}/usr/bin/clang)
SET (CC "${DEVROOT}/usr/bin/clang")
SET (CXX "${DEVROOT}/usr/bin/clang++")

CMAKE_FORCE_C_COMPILER (${CC} LLVM)
Expand Down
6 changes: 3 additions & 3 deletions port/iOS/IPHONEOS_X86_64_TOOLCHAIN.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ INCLUDE(CMakeForceCompiler)

SET (CMAKE_CROSSCOMPILING TRUE)
SET (CMAKE_SYSTEM_NAME "Darwin")
SET (CMAKE_SYSTEM_PROCESSOR x86_64)
SET (CMAKE_SYSTEM_PROCESSOR "x86_64")

SET (SDKVER 7.1)
SET (SDKVER "7.1")

SET (DEVROOT "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain")
SET (SDKROOT "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${SDKVER}.sdk")
SET (CC "${DEVROOT}/usr/bin/clang)
SET (CC "${DEVROOT}/usr/bin/clang")
SET (CXX "${DEVROOT}/usr/bin/clang++")

CMAKE_FORCE_C_COMPILER (${CC} LLVM)
Expand Down

0 comments on commit 85b756a

Please sign in to comment.