Skip to content
Permalink
Browse files

Merge pull request #343 from jordan-woyak/disable-sdl-windows

Disable SDL input on Windows.
  • Loading branch information...
shuffle2 committed May 22, 2014
2 parents 36d4874 + 635dbd0 commit dd413269e30c35a2744c9321323b7fb9d48ce942
Showing with 11 additions and 51,799 deletions.
  1. +4 −4 CMakeLists.txt
  2. +0 −22 Externals/SDL/CMakeLists.txt
  3. +0 −2 Externals/SDL/SDL/SDL.h
  4. +0 −65 Externals/SDL/SDL/SDL_config_bsd.h
  5. +0 −311 Externals/SDL/SDL/SDL_config_linux.h
  6. +0 −1 Externals/SDL/SDL/SDL_version.h
  7. +0 −21 Externals/SDL/SDL_config.h
  8. +0 −101 Externals/SDL/include/SDL.h
  9. +0 −63 Externals/SDL/include/SDL_active.h
  10. +0 −284 Externals/SDL/include/SDL_audio.h
  11. +0 −29 Externals/SDL/include/SDL_byteorder.h
  12. +0 −202 Externals/SDL/include/SDL_cdrom.h
  13. +0 −45 Externals/SDL/include/SDL_config.h
  14. +0 −45 Externals/SDL/include/SDL_config.h.default
  15. +0 −310 Externals/SDL/include/SDL_config.h.in
  16. +0 −106 Externals/SDL/include/SDL_config_dreamcast.h
  17. +0 −112 Externals/SDL/include/SDL_config_macos.h
  18. +0 −150 Externals/SDL/include/SDL_config_macosx.h
  19. +0 −62 Externals/SDL/include/SDL_config_minimal.h
  20. +0 −115 Externals/SDL/include/SDL_config_nds.h
  21. +0 −141 Externals/SDL/include/SDL_config_os2.h
  22. +0 −146 Externals/SDL/include/SDL_config_symbian.h
  23. +0 −183 Externals/SDL/include/SDL_config_win32.h
  24. +0 −22 Externals/SDL/include/SDL_copying.h
  25. +0 −69 Externals/SDL/include/SDL_cpuinfo.h
  26. +0 −209 Externals/SDL/include/SDL_endian.h
  27. +0 −72 Externals/SDL/include/SDL_error.h
  28. +0 −356 Externals/SDL/include/SDL_events.h
  29. +0 −28 Externals/SDL/include/SDL_getenv.h
  30. +0 −187 Externals/SDL/include/SDL_joystick.h
  31. +0 −135 Externals/SDL/include/SDL_keyboard.h
  32. +0 −326 Externals/SDL/include/SDL_keysym.h
  33. +0 −78 Externals/SDL/include/SDL_loadso.h
  34. +0 −106 Externals/SDL/include/SDL_main.h
  35. +0 −143 Externals/SDL/include/SDL_mouse.h
  36. +0 −177 Externals/SDL/include/SDL_mutex.h
  37. +0 −11 Externals/SDL/include/SDL_name.h
  38. +0 −6,556 Externals/SDL/include/SDL_opengl.h
  39. +0 −110 Externals/SDL/include/SDL_platform.h
  40. +0 −55 Externals/SDL/include/SDL_quit.h
  41. +0 −155 Externals/SDL/include/SDL_rwops.h
  42. +0 −620 Externals/SDL/include/SDL_stdinc.h
  43. +0 −225 Externals/SDL/include/SDL_syswm.h
  44. +0 −120 Externals/SDL/include/SDL_thread.h
  45. +0 −125 Externals/SDL/include/SDL_timer.h
  46. +0 −28 Externals/SDL/include/SDL_types.h
  47. +0 −91 Externals/SDL/include/SDL_version.h
  48. +0 −951 Externals/SDL/include/SDL_video.h
  49. +0 −191 Externals/SDL/include/begin_code.h
  50. +0 −46 Externals/SDL/include/close_code.h
  51. +0 −946 Externals/SDL/include/doxyfile
  52. +0 −350 Externals/SDL/src/SDL.c
  53. +0 −238 Externals/SDL/src/SDL_error.c
  54. +0 −58 Externals/SDL/src/SDL_error_c.h
  55. +0 −134 Externals/SDL/src/SDL_fatal.c
  56. +0 −28 Externals/SDL/src/SDL_fatal.h
  57. +0 −576 Externals/SDL/src/joystick/SDL_joystick.c
  58. +0 −38 Externals/SDL/src/joystick/SDL_joystick_c.h
  59. +0 −82 Externals/SDL/src/joystick/SDL_sysjoystick.h
  60. +0 −606 Externals/SDL/src/joystick/bsd/SDL_sysjoystick.c
  61. +0 −874 Externals/SDL/src/joystick/darwin/10.3.9-FIX/IOHIDLib.h
  62. +0 −846 Externals/SDL/src/joystick/darwin/SDL_sysjoystick.c
  63. +0 −83 Externals/SDL/src/joystick/dummy/SDL_sysjoystick.c
  64. +0 −1,202 Externals/SDL/src/joystick/linux/SDL_sysjoystick.c
  65. +0 −407 Externals/SDL/src/joystick/win32/SDL_mmjoystick.c
  66. +0 −5,111 Externals/SDL/src/stdlib/SDL_malloc.c
  67. +0 −1,248 Externals/SDL/src/stdlib/SDL_string.c
  68. +0 −16 Externals/SDL2-2.0.1/BUGS.txt
  69. +0 −20 Externals/SDL2-2.0.1/COPYING.txt
  70. +0 −13 Externals/SDL2-2.0.1/README-SDL.txt
  71. +0 −38 Externals/SDL2-2.0.1/README.txt
  72. +0 −57 Externals/SDL2-2.0.1/WhatsNew.txt
  73. +0 −163 Externals/SDL2-2.0.1/include/SDL.h
  74. +0 −246 Externals/SDL2-2.0.1/include/SDL_assert.h
  75. +0 −359 Externals/SDL2-2.0.1/include/SDL_atomic.h
  76. +0 −506 Externals/SDL2-2.0.1/include/SDL_audio.h
  77. +0 −97 Externals/SDL2-2.0.1/include/SDL_bits.h
  78. +0 −63 Externals/SDL2-2.0.1/include/SDL_blendmode.h
  79. +0 −71 Externals/SDL2-2.0.1/include/SDL_clipboard.h
  80. +0 −195 Externals/SDL2-2.0.1/include/SDL_config.h
  81. +0 −151 Externals/SDL2-2.0.1/include/SDL_cpuinfo.h
  82. +0 −239 Externals/SDL2-2.0.1/include/SDL_endian.h
  83. +0 −76 Externals/SDL2-2.0.1/include/SDL_error.h
  84. +0 −720 Externals/SDL2-2.0.1/include/SDL_events.h
  85. +0 −136 Externals/SDL2-2.0.1/include/SDL_filesystem.h
  86. +0 −298 Externals/SDL2-2.0.1/include/SDL_gamecontroller.h
  87. +0 −87 Externals/SDL2-2.0.1/include/SDL_gesture.h
  88. +0 −1,225 Externals/SDL2-2.0.1/include/SDL_haptic.h
  89. +0 −355 Externals/SDL2-2.0.1/include/SDL_hints.h
  90. +0 −253 Externals/SDL2-2.0.1/include/SDL_joystick.h
  91. +0 −217 Externals/SDL2-2.0.1/include/SDL_keyboard.h
  92. +0 −341 Externals/SDL2-2.0.1/include/SDL_keycode.h
  93. +0 −81 Externals/SDL2-2.0.1/include/SDL_loadso.h
  94. +0 −211 Externals/SDL2-2.0.1/include/SDL_log.h
  95. +0 −125 Externals/SDL2-2.0.1/include/SDL_main.h
  96. +0 −144 Externals/SDL2-2.0.1/include/SDL_messagebox.h
  97. +0 −224 Externals/SDL2-2.0.1/include/SDL_mouse.h
  98. +0 −251 Externals/SDL2-2.0.1/include/SDL_mutex.h
  99. +0 −11 Externals/SDL2-2.0.1/include/SDL_name.h
  100. +0 −11,126 Externals/SDL2-2.0.1/include/SDL_opengl.h
  101. +0 −38 Externals/SDL2-2.0.1/include/SDL_opengles.h
  102. +0 −38 Externals/SDL2-2.0.1/include/SDL_opengles2.h
  103. +0 −427 Externals/SDL2-2.0.1/include/SDL_pixels.h
  104. +0 −155 Externals/SDL2-2.0.1/include/SDL_platform.h
  105. +0 −75 Externals/SDL2-2.0.1/include/SDL_power.h
  106. +0 −58 Externals/SDL2-2.0.1/include/SDL_quit.h
  107. +0 −138 Externals/SDL2-2.0.1/include/SDL_rect.h
  108. +0 −870 Externals/SDL2-2.0.1/include/SDL_render.h
  109. +0 −2 Externals/SDL2-2.0.1/include/SDL_revision.h
  110. +0 −232 Externals/SDL2-2.0.1/include/SDL_rwops.h
  111. +0 −401 Externals/SDL2-2.0.1/include/SDL_scancode.h
  112. +0 −143 Externals/SDL2-2.0.1/include/SDL_shape.h
  113. +0 −392 Externals/SDL2-2.0.1/include/SDL_stdinc.h
  114. +0 −503 Externals/SDL2-2.0.1/include/SDL_surface.h
  115. +0 −121 Externals/SDL2-2.0.1/include/SDL_system.h
  116. +0 −237 Externals/SDL2-2.0.1/include/SDL_syswm.h
  117. +0 −68 Externals/SDL2-2.0.1/include/SDL_test.h
  118. +0 −105 Externals/SDL2-2.0.1/include/SDL_test_assert.h
  119. +0 −187 Externals/SDL2-2.0.1/include/SDL_test_common.h
  120. +0 −69 Externals/SDL2-2.0.1/include/SDL_test_compare.h
  121. +0 −124 Externals/SDL2-2.0.1/include/SDL_test_crc32.h
  122. +0 −62 Externals/SDL2-2.0.1/include/SDL_test_font.h
  123. +0 −384 Externals/SDL2-2.0.1/include/SDL_test_fuzzer.h
  124. +0 −123 Externals/SDL2-2.0.1/include/SDL_test_harness.h
  125. +0 −78 Externals/SDL2-2.0.1/include/SDL_test_images.h
  126. +0 −67 Externals/SDL2-2.0.1/include/SDL_test_log.h
  127. +0 −129 Externals/SDL2-2.0.1/include/SDL_test_md5.h
  128. +0 −115 Externals/SDL2-2.0.1/include/SDL_test_random.h
  129. +0 −242 Externals/SDL2-2.0.1/include/SDL_thread.h
  130. +0 −115 Externals/SDL2-2.0.1/include/SDL_timer.h
  131. +0 −86 Externals/SDL2-2.0.1/include/SDL_touch.h
  132. +0 −29 Externals/SDL2-2.0.1/include/SDL_types.h
  133. +0 −162 Externals/SDL2-2.0.1/include/SDL_version.h
  134. +0 −974 Externals/SDL2-2.0.1/include/SDL_video.h
  135. +0 −140 Externals/SDL2-2.0.1/include/begin_code.h
  136. +0 −37 Externals/SDL2-2.0.1/include/close_code.h
  137. BIN Externals/SDL2-2.0.1/lib/Win32/SDL2.dll
  138. BIN Externals/SDL2-2.0.1/lib/Win32/SDL2.lib
  139. BIN Externals/SDL2-2.0.1/lib/x64/SDL2.dll
  140. BIN Externals/SDL2-2.0.1/lib/x64/SDL2.lib
  141. +0 −3 Source/Core/DolphinWX/CMakeLists.txt
  142. +4 −3 Source/Core/InputCommon/CMakeLists.txt
  143. +3 −2 Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
  144. +0 −2 Source/Core/InputCommon/InputCommon.vcxproj
  145. +0 −9 Source/Core/InputCommon/InputCommon.vcxproj.filters
@@ -581,6 +581,7 @@ if(NOT ANDROID)
endif()
if(SDL2_FOUND)
message("Using shared SDL2")
add_definitions(-DHAVE_SDL=1)
include_directories(${SDL2_INCLUDE_DIR})
else(SDL2_FOUND)
# SDL2 not found, try SDL
@@ -589,12 +590,11 @@ if(NOT ANDROID)
endif()
if(SDL_FOUND)
message("Using shared SDL")
add_definitions(-DHAVE_SDL=1)
include_directories(${SDL_INCLUDE_DIR})
else(SDL_FOUND)
# TODO: Use the prebuilt one on Windows
message("Using static SDL from Externals")
include_directories(Externals/SDL/SDL Externals/SDL Externals/SDL/include)
add_subdirectory(Externals/SDL)
message("SDL NOT found, disabling SDL input")
add_definitions(-DHAVE_SDL=0)
endif(SDL_FOUND)
endif(SDL2_FOUND)
endif()

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit dd41326

Please sign in to comment.
You can’t perform that action at this time.