Permalink
Browse files

Remove every trailing whitespace from the project (but externals).

  • Loading branch information...
1 parent fb597b6 commit b1503b202043a577720e28969b74cca6f9c954f8 @linkmauve linkmauve committed May 25, 2015
Showing with 212 additions and 212 deletions.
  1. +1 −1 .travis-build.sh
  2. +3 −3 .travis-upload.sh
  3. +1 −1 .travis.yml
  4. +2 −2 CMakeLists.txt
  5. +62 −62 Doxyfile
  6. +1 −1 README.md
  7. +2 −2 appveyor.yml
  8. BIN src/citra/resource.h
  9. +3 −3 src/citra_qt/CMakeLists.txt
  10. +1 −1 src/citra_qt/bootmanager.cpp
  11. +1 −1 src/citra_qt/bootmanager.h
  12. +1 −1 src/citra_qt/debugger/callstack.cpp
  13. +1 −1 src/citra_qt/main.cpp
  14. +1 −1 src/common/emu_window.cpp
  15. +1 −1 src/common/file_util.cpp
  16. +1 −1 src/common/swap.h
  17. +1 −1 src/core/arm/disassembler/arm_disasm.cpp
  18. +16 −16 src/core/arm/dyncom/arm_dyncom_interpreter.cpp
  19. +1 −1 src/core/arm/dyncom/arm_dyncom_thumb.cpp
  20. +1 −1 src/core/arm/interpreter/armsupp.cpp
  21. +3 −3 src/core/arm/skyeye_common/armdefs.h
  22. +2 −2 src/core/arm/skyeye_common/vfp/vfp_helper.h
  23. +1 −1 src/core/core_timing.cpp
  24. +1 −1 src/core/core_timing.h
  25. +2 −2 src/core/file_sys/archive_extsavedata.cpp
  26. +2 −2 src/core/file_sys/archive_extsavedata.h
  27. +1 −1 src/core/file_sys/archive_savedata.cpp
  28. +4 −4 src/core/hle/kernel/resource_limit.h
  29. +1 −1 src/core/hle/kernel/semaphore.cpp
  30. +4 −4 src/core/hle/kernel/thread.cpp
  31. +1 −1 src/core/hle/kernel/thread.h
  32. +1 −1 src/core/hle/kernel/timer.cpp
  33. +2 −2 src/core/hle/service/apt/apt.cpp
  34. +4 −4 src/core/hle/service/apt/apt.h
  35. +1 −1 src/core/hle/service/boss_p.h
  36. +1 −1 src/core/hle/service/boss_u.h
  37. +1 −1 src/core/hle/service/cam_u.cpp
  38. +2 −2 src/core/hle/service/cfg/cfg.cpp
  39. +3 −3 src/core/hle/service/fs/archive.cpp
  40. +3 −3 src/core/hle/service/fs/fs_user.cpp
  41. +12 −12 src/core/hle/service/gsp_gpu.cpp
  42. +1 −1 src/core/hle/service/hid/hid.cpp
  43. +1 −1 src/core/hle/service/hid/hid_spvr.cpp
  44. +1 −1 src/core/hle/service/hid/hid_user.h
  45. +3 −3 src/core/hle/service/ptm/ptm.h
  46. +1 −1 src/core/hle/service/ptm/ptm_play.cpp
  47. +1 −1 src/core/hle/service/service.cpp
  48. +15 −15 src/core/hle/service/soc_u.cpp
  49. +2 −2 src/core/hle/svc.cpp
  50. +5 −5 src/core/hw/gpu.cpp
  51. +1 −1 src/core/hw/lcd.cpp
  52. +1 −1 src/core/hw/lcd.h
  53. +1 −1 src/core/loader/3dsx.cpp
  54. +1 −1 src/core/memory.h
  55. +4 −4 src/video_core/command_processor.cpp
  56. +1 −1 src/video_core/debug_utils/debug_utils.cpp
  57. +1 −1 src/video_core/math.h
  58. +4 −4 src/video_core/pica.h
  59. +1 −1 src/video_core/rasterizer.cpp
  60. +8 −8 src/video_core/renderer_opengl/generated/gl_3_2_core.c
  61. +1 −1 src/video_core/renderer_opengl/gl_rasterizer.cpp
  62. +1 −1 src/video_core/renderer_opengl/gl_state.cpp
  63. +1 −1 src/video_core/renderer_opengl/gl_state.h
  64. +1 −1 src/video_core/renderer_opengl/renderer_opengl.cpp
  65. +2 −2 src/video_core/vertex_shader.cpp
View
@@ -6,7 +6,7 @@ set -x
#if OS is linux or is not set
if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
mkdir build && cd build
- cmake -DUSE_QT5=OFF ..
+ cmake -DUSE_QT5=OFF ..
make -j4
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
export Qt5_DIR=$(brew --prefix)/opt/qt5
View
@@ -6,23 +6,23 @@ if [ "$TRAVIS_BRANCH" = "master" ]; then
REV_NAME="citra-${GITDATE}-${GITREV}-linux-amd64"
UPLOAD_DIR="/citra/nightly/linux-amd64"
mkdir "$REV_NAME"
-
+
sudo apt-get -qq install lftp
cp build/src/citra/citra "$REV_NAME"
cp build/src/citra_qt/citra-qt "$REV_NAME"
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
REV_NAME="citra-${GITDATE}-${GITREV}-osx-amd64"
UPLOAD_DIR="/citra/nightly/osx-amd64"
mkdir "$REV_NAME"
-
+
brew install lftp
cp build/src/citra/Release/citra "$REV_NAME"
cp -r build/src/citra_qt/Release/citra-qt.app "$REV_NAME"
# move qt libs into app bundle for deployment
$(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/citra-qt.app"
fi
-
+
ARCHIVE_NAME="${REV_NAME}.tar.xz"
tar -cJvf "$ARCHIVE_NAME" "$REV_NAME"
lftp -c "open -u citra-builds,$BUILD_PASSWORD sftp://builds.citra-emu.org; put -O '$UPLOAD_DIR' '$ARCHIVE_NAME'"
View
@@ -6,7 +6,7 @@ language: cpp
env:
global:
- - secure: "AXHFIafTmbGDsHD3mUVj5a4I397DQjti/WoqAJGUp2PglxTcc04BwxZ9Z+xLuf5N2Hs5r9ojAJLT8OGxJCLBDXzneQTNSqXbFuYSLbqrEAiIRlA9eRIotWCg+wYcO+5e8MKX+cHVKwiIWasUB21AtCdq6msh6Y3pUshZp212VPg="
+ - secure: "AXHFIafTmbGDsHD3mUVj5a4I397DQjti/WoqAJGUp2PglxTcc04BwxZ9Z+xLuf5N2Hs5r9ojAJLT8OGxJCLBDXzneQTNSqXbFuYSLbqrEAiIRlA9eRIotWCg+wYcO+5e8MKX+cHVKwiIWasUB21AtCdq6msh6Y3pUshZp212VPg="
before_install:
- sh .travis-deps.sh
View
@@ -38,7 +38,7 @@ else()
set(CMAKE_CXX_FLAGS_RELEASE "${optimization_flags} /MP /MD" CACHE STRING "" FORCE)
set(CMAKE_C_FLAGS_RELWITHDEBINFO "${optimization_flags} /MP /MD /Zi /Zo" CACHE STRING "" FORCE)
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${optimization_flags} /MP /MD /Zi /Zo" CACHE STRING "" FORCE)
-
+
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "/DEBUG" CACHE STRING "" FORCE)
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "/DEBUG" CACHE STRING "" FORCE)
endif()
@@ -130,7 +130,7 @@ IF (APPLE)
FIND_LIBRARY(IOKIT_LIBRARY IOKit) # GLFW dependency
FIND_LIBRARY(COREVIDEO_LIBRARY CoreVideo) # GLFW dependency
set(PLATFORM_LIBRARIES iconv ${COCOA_LIBRARY} ${IOKIT_LIBRARY} ${COREVIDEO_LIBRARY})
-
+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++")
ELSEIF(MINGW)
Oops, something went wrong.

0 comments on commit b1503b2

Please sign in to comment.