Skip to content
Permalink
Browse files

Merge pull request #1 from libretro/master

Rebase
  • Loading branch information
evilwraith committed Apr 16, 2019
2 parents f87e085 + 5012969 commit b6bb24e01693da43d93bee1562d1bbf902a79e2a
Showing with 22,926 additions and 21,670 deletions.
  1. +3 −0 .gitignore
  2. +3 −0 .gitmodules
  3. +32 −29 .travis.yml
  4. +153 −95 CMakeLists.txt
  5. +53 −0 CMakeSettings.json
  6. +16 −3 README.md
  7. +24 −0 cmake/Architecture.cmake
  8. +32 −0 cmake/LLVMToolchain.cmake
  9. +62 −0 cmake/Win32Deps.cmake
  10. +4 −0 fex/7z_C/7zAlloc.c
  11. +7 −1 fex/fex/Data_Reader.cpp
  12. +7,461 −7,461 headers/stb/stb_image.h
  13. +226 −9 installdeps
  14. +56 −0 src/Util.cpp
  15. +12 −0 src/Util.h
  16. +1,366 −1,351 src/common/ConfigManager.cpp
  17. +183 −181 src/common/ConfigManager.h
  18. +1 −1 src/common/SoundDriver.h
  19. +3 −2 src/common/SoundSDL.cpp
  20. +1 −1 src/common/SoundSDL.h
  21. +1 −1 src/common/iniparser.c
  22. +10 −10 src/filters/2xSaI.cpp
  23. +2 −2 src/filters/hq/c/hq_shared.h
  24. +10 −6 src/filters/interframe.cpp
  25. +1 −1 src/filters/interframe.hpp
  26. +37 −37 src/filters/xBRZ/config.h
  27. +1,227 −1,225 src/filters/xBRZ/xbrz.cpp
  28. +102 −102 src/filters/xBRZ/xbrz.h
  29. +8 −12 src/gb/GB.cpp
  30. +1 −1 src/gb/gb.h
  31. +3 −3 src/gb/gbCheats.cpp
  32. +10 −1 src/gb/gbMemory.cpp
  33. +4 −4 src/gb/gbSGB.cpp
  34. +1 −1 src/gb/gbSound.cpp
  35. +871 −868 src/gba/BreakpointStructures.cpp
  36. +20 −20 src/gba/Cheats.cpp
  37. +16 −16 src/gba/GBA-arm.cpp
  38. +24 −24 src/gba/GBA-thumb.cpp
  39. +9 −9 src/gba/GBA.cpp
  40. +1 −0 src/gba/GBA.h
  41. +7 −4 src/gba/GBALink.cpp
  42. +1 −0 src/gba/GBASockClient.cpp
  43. +1 −1 src/gba/GBAinline.h
  44. +20 −20 src/gba/debugger-expr-lex.cpp
  45. +1,753 −1,753 src/gba/debugger-expr-yacc.cpp
  46. +585 −584 src/gba/ereader.cpp
  47. +9 −9 src/gba/ereader.h
  48. +27 −7 src/gba/remote.cpp
  49. +79 −79 src/gba/remote.h
  50. +6 −0 src/libretro/SoundRetro.cpp
  51. +1 −0 src/libretro/SoundRetro.h
  52. +1 −1 src/libretro/UtilRetro.cpp
  53. +4 −2 src/libretro/libretro.cpp
  54. +130 −78 src/sdl/SDL.cpp
  55. +15 −15 src/sdl/expr-lex.cpp
  56. +1 −0 src/sdl/expr.cpp
  57. +3 −0 src/sdl/exprNode.cpp
  58. +1 −0 src/sdl/filters.cpp
  59. +2 −2 src/sdl/getopt.c
  60. +635 −390 src/wx/CMakeLists.txt
  61. +31 −27 src/wx/cmdevents.cpp
  62. +1 −1 src/wx/copy-events.cmake
  63. +5 −5 src/wx/faudio.cpp
  64. +27 −2 src/wx/gfxviewers.cpp
  65. +118 −67 src/wx/guiinit.cpp
  66. +5 −2 src/wx/openal.cpp
  67. +102 −86 src/wx/opts.cpp
  68. +8 −0 src/wx/opts.h
  69. +83 −43 src/wx/panel.cpp
  70. +7 −17 src/wx/strutils.cpp
  71. +3 −5 src/wx/strutils.h
  72. +23 −17 src/wx/sys.cpp
  73. +37 −6 src/wx/viewers.cpp
  74. +27 −18 src/wx/viewsupt.cpp
  75. +3 −1 src/wx/viewsupt.h
  76. +11 −4 src/wx/widgets/joyedit.cpp
  77. +16 −15 src/wx/widgets/keyedit.cpp
  78. +19 −11 src/wx/widgets/sdljoy.cpp
  79. +4 −0 src/wx/widgets/wx/joyedit.h
  80. +1 −0 src/wx/widgets/wx/keyedit.h
  81. +2 −2 src/wx/widgets/wx/sdljoy.h
  82. +7 −3 src/wx/widgets/wx/wxmisc.h
  83. +2 −1 src/wx/widgets/wxmisc.cpp
  84. +188 −75 src/wx/wxvbam.cpp
  85. +17 −1 src/wx/wxvbam.h
  86. +128 −128 src/wx/xrc/AccelConfig.xrc
  87. +113 −113 src/wx/xrc/CheatAdd.xrc
  88. +218 −218 src/wx/xrc/CheatCreate.xrc
  89. +93 −93 src/wx/xrc/CheatEdit.xrc
  90. +62 −62 src/wx/xrc/CheatList.xrc
  91. +28 −28 src/wx/xrc/CodeSelect.xrc
  92. +135 −135 src/wx/xrc/DirectoriesConfig.xrc
  93. +482 −482 src/wx/xrc/Disassemble.xrc
  94. +303 −303 src/wx/xrc/DisplayConfig.xrc
  95. +69 −69 src/wx/xrc/ExportSPS.xrc
  96. +170 −170 src/wx/xrc/GBAROMInfo.xrc
  97. +105 −105 src/wx/xrc/GBColorPrefPanel.xrc
  98. +251 −251 src/wx/xrc/GBDisassemble.xrc
  99. +172 −172 src/wx/xrc/GBMapViewer.xrc
  100. +165 −165 src/wx/xrc/GBOAMViewer.xrc
  101. +133 −133 src/wx/xrc/GBPaletteViewer.xrc
  102. +74 −74 src/wx/xrc/GBPrinter.xrc
  103. +179 −179 src/wx/xrc/GBROMInfo.xrc
  104. +168 −168 src/wx/xrc/GBTileViewer.xrc
  105. +258 −258 src/wx/xrc/GameBoyAdvanceConfig.xrc
  106. +174 −174 src/wx/xrc/GameBoyConfig.xrc
  107. +203 −203 src/wx/xrc/GeneralConfig.xrc
  108. +351 −351 src/wx/xrc/IOViewer.xrc
  109. +369 −369 src/wx/xrc/JoyPanel.xrc
  110. +49 −49 src/wx/xrc/JoypadConfig.xrc
  111. +44 −44 src/wx/xrc/LinkConfig.xrc
  112. +140 −140 src/wx/xrc/Logging.xrc
  113. +22 −22 src/wx/xrc/MainFrame.xrc
  114. +4 −4 src/wx/xrc/MainIcon.xrc
  115. +649 −647 src/wx/xrc/MainMenu.xrc
  116. +234 −234 src/wx/xrc/MapViewer.xrc
  117. +50 −50 src/wx/xrc/MemSelRegion.xrc
  118. +131 −131 src/wx/xrc/MemViewer.xrc
  119. +98 −98 src/wx/xrc/NetLink.xrc
  120. +178 −178 src/wx/xrc/OAMViewer.xrc
  121. +125 −125 src/wx/xrc/PaletteViewer.xrc
  122. +353 −353 src/wx/xrc/SoundConfig.xrc
  123. +177 −177 src/wx/xrc/SpeedupConfig.xrc
  124. +184 −184 src/wx/xrc/TileViewer.xrc
  125. +1 −0 vcpkg
@@ -6,10 +6,13 @@ src/wx/cmdtab.cpp
src/wx/wxvbam.xrs
build/*
build32/*
vsbuild/*
dependencies/*
vcpkg/*
.vs/*
*.o
*.so
*.dll
*.exe

# vim swap files
@@ -1,3 +1,6 @@
[submodule "dependencies"]
path = dependencies
url = https://github.com/visualboyadvance-m/dependencies.git
[submodule "vcpkg"]
path = vcpkg
url = https://github.com/Microsoft/vcpkg.git
@@ -1,6 +1,9 @@
---
sudo: required

services:
- xvfb

matrix:
fast_finish: true
include:
@@ -15,38 +18,38 @@ matrix:
- cd build
- cmake ..
- make -j2
# - ./visualboyadvance-m --help
# - xvfb-run ./visualboyadvance-m --help
cache:
directories:
- "$HOME/.ccache"
- env: BUILD_ENV=mingw-w64
language: cpp
os: linux
dist: trusty
before_script:
- ./installdeps MinGW-w64-x86_64
script:
- mkdir build
- cd build
- /usr/lib/mxe/usr/bin/x86_64-w64-mingw32.static-cmake ..
- make -j2
cache:
directories:
- "$HOME/.ccache"
- env: BUILD_ENV=mingw-w32
language: cpp
os: linux
dist: trusty
before_script:
- ./installdeps MinGW-w64-i686
script:
- mkdir build
- cd build
- /usr/lib/mxe/usr/bin/i686-w64-mingw32.static-cmake ..
- make -j2
cache:
directories:
- "$HOME/.ccache"
# - env: BUILD_ENV=mingw-w64
# language: cpp
# os: linux
# dist: trusty
# before_script:
# - ./installdeps MinGW-w64-x86_64
# script:
# - mkdir build
# - cd build
# - /usr/lib/mxe/usr/bin/x86_64-w64-mingw32.static-cmake ..
# - make -j2
# cache:
# directories:
# - "$HOME/.ccache"
# - env: BUILD_ENV=mingw-w32
# language: cpp
# os: linux
# dist: trusty
# before_script:
# - ./installdeps MinGW-w64-i686
# script:
# - mkdir build
# - cd build
# - /usr/lib/mxe/usr/bin/i686-w64-mingw32.static-cmake ..
# - make -j2
# cache:
# directories:
# - "$HOME/.ccache"
- env: BUILD_ENV=libretro
language: cpp
os: linux

0 comments on commit b6bb24e

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