Skip to content
Permalink
Browse files

Merge pull request #57 from retro-wertz/sync

update
  • Loading branch information
hizzlekizzle committed Jul 17, 2019
2 parents 8cb4200 + d808297 commit b147e9129f1d8c9c62ad5d12d120d3e3243c6fd0
Showing with 50,896 additions and 44,325 deletions.
  1. +0 −90 .clang-format
  2. +2 −0 .github/ISSUE_TEMPLATE.md
  3. +2 −0 .gitignore
  4. +0 −3 .gitmodules
  5. +7 −5 .travis.yml
  6. +70 −0 CHANGELOG.md
  7. +42 −9 CMakeLists.txt
  8. +8 −12 CMakeSettings.json
  9. +9 −0 README.md
  10. +2 −0 cmake/Architecture.cmake
  11. +12 −0 cmake/LLVMToolchain.cmake
  12. +63 −0 cmake/Set-Toolchain-vcpkg.cmake
  13. +125 −0 cmake/VbamFunctions.cmake
  14. +0 −62 cmake/Win32Deps.cmake
  15. +1 −1 dependencies
  16. +0 −20 fex/File_Extractor2010.sln
  17. +0 −159 fex/File_Extractor2010.vcxproj
  18. +0 −190 fex/File_Extractor2010.vcxproj.filters
  19. +0 −3 fex/File_Extractor2010.vcxproj.user
  20. +0 −161 fex/File_Extractor2013.vcxproj
  21. +0 −190 fex/File_Extractor2013.vcxproj.filters
  22. +26 −3 installdeps
  23. +683 −496 po/wxvbam/ar.po
  24. +686 −499 po/wxvbam/br.po
  25. +683 −496 po/wxvbam/bs.po
  26. +683 −496 po/wxvbam/ca.po
  27. +683 −496 po/wxvbam/ca_ES.po
  28. +684 −497 po/wxvbam/cs.po
  29. +683 −496 po/wxvbam/da.po
  30. +683 −496 po/wxvbam/da_DK.po
  31. +684 −497 po/wxvbam/de.po
  32. +683 −496 po/wxvbam/de_DE.po
  33. +684 −497 po/wxvbam/el.po
  34. +683 −496 po/wxvbam/el_GR.po
  35. +683 −496 po/wxvbam/en_GB.po
  36. +683 −496 po/wxvbam/en_US.po
  37. +684 −497 po/wxvbam/es.po
  38. +683 −496 po/wxvbam/es_419.po
  39. +683 −496 po/wxvbam/es_AR.po
  40. +683 −496 po/wxvbam/es_CL.po
  41. +683 −496 po/wxvbam/es_CO.po
  42. +683 −496 po/wxvbam/es_ES.po
  43. +685 −498 po/wxvbam/es_MX.po
  44. +683 −496 po/wxvbam/es_PR.po
  45. +683 −496 po/wxvbam/es_US.po
  46. +683 −496 po/wxvbam/fil.po
  47. +688 −499 po/wxvbam/fr.po
  48. +683 −496 po/wxvbam/fr_CA.po
  49. +686 −497 po/wxvbam/fr_FR.po
  50. +685 −498 po/wxvbam/gl.po
  51. +683 −496 po/wxvbam/haw.po
  52. +683 −496 po/wxvbam/he.po
  53. +683 −496 po/wxvbam/he_IL.po
  54. +683 −496 po/wxvbam/hr.po
  55. +684 −497 po/wxvbam/hu.po
  56. +684 −497 po/wxvbam/hu_HU.po
  57. +684 −497 po/wxvbam/id.po
  58. +683 −496 po/wxvbam/id_ID.po
  59. +683 −496 po/wxvbam/it.po
  60. +684 −497 po/wxvbam/it_IT.po
  61. +684 −497 po/wxvbam/ja.po
  62. +683 −496 po/wxvbam/ja_JP.po
  63. +683 −496 po/wxvbam/jv.po
  64. +684 −497 po/wxvbam/ko.po
  65. +683 −496 po/wxvbam/ko_KR.po
  66. +684 −497 po/wxvbam/ms_MY.po
  67. +684 −497 po/wxvbam/nb.po
  68. +718 −531 po/wxvbam/nl.po
  69. +683 −496 po/wxvbam/nl_NL.po
  70. +683 −496 po/wxvbam/no.po
  71. +830 −642 po/wxvbam/pl.po
  72. +683 −496 po/wxvbam/pl_PL.po
  73. +683 −496 po/wxvbam/pt.po
  74. +684 −497 po/wxvbam/pt_BR.po
  75. +683 −496 po/wxvbam/pt_PT.po
  76. +685 −498 po/wxvbam/ru.po
  77. +717 −529 po/wxvbam/ru_RU.po
  78. +683 −496 po/wxvbam/sk.po
  79. +683 −496 po/wxvbam/sk_SK.po
  80. +683 −496 po/wxvbam/sr.po
  81. +683 −496 po/wxvbam/su.po
  82. +708 −520 po/wxvbam/sv.po
  83. +683 −496 po/wxvbam/tk.po
  84. +684 −497 po/wxvbam/tr.po
  85. +660 −495 po/wxvbam/wxvbam.pot
  86. +684 −497 po/wxvbam/zh-Hans.po
  87. +683 −496 po/wxvbam/zh.po
  88. +684 −497 po/wxvbam/zh_CN.GB2312.po
  89. +684 −497 po/wxvbam/zh_CN.po
  90. +683 −496 po/wxvbam/zh_HK.po
  91. +683 −496 po/wxvbam/zh_TW.Big5.po
  92. +687 −499 po/wxvbam/zh_TW.po
  93. +0 −586 project/vs2010_mfc/VBA-M-MFC.vcxproj
  94. +0 −559 project/vs2010_mfc/VBA-M-MFC.vcxproj.filters
  95. +0 −249 project/vs2010_mfc/VBA-M-SDL.vcxproj
  96. +0 −133 project/vs2010_mfc/VBA-M-SDL.vcxproj.filters
  97. +0 −450 project/vs2010_mfc/VBA-M-WX.vcxproj
  98. +0 −256 project/vs2010_mfc/VBA-M-WX.vcxproj.filters
  99. +0 −298 project/vs2010_mfc/VBA2010.sln
  100. +0 −286 project/vs2010_mfc/VBA2010.vcxproj
  101. +0 −335 project/vs2010_mfc/VBA2010.vcxproj.filters
  102. +0 −3 project/vs2010_mfc/VBA2010.vcxproj.user
  103. +0 −26 project/vs2010_mfc/nasm.props
  104. +0 −168 project/vs2010_mfc/nasm.rules
  105. +0 −90 project/vs2010_mfc/nasm.targets
  106. +0 −250 project/vs2010_mfc/nasm.xml
  107. +0 −6 project/vs2010_mfc/per_user_settings.props
  108. +0 −595 project/vs2013_mfc/VBA-M-MFC.vcxproj
  109. +0 −559 project/vs2013_mfc/VBA-M-MFC.vcxproj.filters
  110. +0 −256 project/vs2013_mfc/VBA-M-SDL.vcxproj
  111. +0 −133 project/vs2013_mfc/VBA-M-SDL.vcxproj.filters
  112. +0 −454 project/vs2013_mfc/VBA-M-WX.vcxproj
  113. +0 −256 project/vs2013_mfc/VBA-M-WX.vcxproj.filters
  114. +0 −347 project/vs2013_mfc/VBA2013.sln
  115. +0 −292 project/vs2013_mfc/VBA2013.vcxproj
  116. +0 −335 project/vs2013_mfc/VBA2013.vcxproj.filters
  117. +0 −3 project/vs2013_mfc/VBA2013.vcxproj.user
  118. +0 −26 project/vs2013_mfc/nasm.props
  119. +0 −168 project/vs2013_mfc/nasm.rules
  120. +0 −90 project/vs2013_mfc/nasm.targets
  121. +0 −250 project/vs2013_mfc/nasm.xml
  122. +0 −6 project/vs2013_mfc/per_user_settings.props
  123. +6 −4 src/Util.cpp
  124. +11 −0 src/common/BSD.h
  125. +14 −17 src/common/ConfigManager.cpp
  126. +3 −2 src/common/ConfigManager.h
  127. +5 −3 src/common/Patch.cpp
  128. +3 −3 src/gba/GBA.cpp
  129. +2 −2 src/gba/GBALink.cpp
  130. +1 −1 src/gba/GBAinline.h
  131. +24 −22 src/gba/Sound.cpp
  132. +8 −7 src/gba/Sound.h
  133. +10 −3 src/libretro/Makefile
  134. +3 −1 src/libretro/Makefile.common
  135. +1,095 −419 src/libretro/{ → libretro-common/include}/libretro.h
  136. +39 −0 src/libretro/libretro-common/include/retro_inline.h
  137. +43 −33 src/libretro/libretro.cpp
  138. +642 −0 src/libretro/libretro_core_options.h
  139. +1 −1 src/sdl/SDL.cpp
  140. +50 −158 src/wx/CMakeLists.txt
  141. +52 −2 src/wx/cmdevents.cpp
  142. +28 −11 src/wx/guiinit.cpp
  143. +34 −19 src/wx/opts.cpp
  144. +5 −4 src/wx/opts.h
  145. +73 −65 src/wx/panel.cpp
  146. +4 −22 src/wx/sys.cpp
  147. +34 −20 src/wx/widgets/joyedit.cpp
  148. +12 −5 src/wx/widgets/keyedit.cpp
  149. +29 −6 src/wx/widgets/sdljoy.cpp
  150. +79 −51 src/wx/wxvbam.cpp
  151. +12 −3 src/wx/wxvbam.h
  152. +33 −40 src/wx/xrc/MainMenu.xrc
  153. +1 −1 src/wx/xrc/SoundConfig.xrc
  154. +57 −20 tools/builder/core.sh
  155. +48 −0 tools/builder/mingw-cross.sh
  156. +0 −16 tools/win/linux-cross-builder
  157. +0 −1 vcpkg

This file was deleted.

@@ -22,6 +22,8 @@ Which games, if any, are NOT affected by the issue (please state if GBA or GB ga

Include screenshots of ROM Information (File > ROM Information):

If you are using a BIOS file, please say which one.

### Option details

Video driver (simple, opengl):
@@ -7,9 +7,11 @@ src/wx/wxvbam.xrs
build/*
build32/*
vsbuild/*
cmake-build*
dependencies/*
vcpkg/*
.vs/*
.idea
*.o
*.so
*.dll
@@ -1,6 +1,3 @@
[submodule "dependencies"]
path = dependencies
url = https://github.com/visualboyadvance-m/dependencies.git
[submodule "vcpkg"]
path = vcpkg
url = https://github.com/Microsoft/vcpkg.git
@@ -16,9 +16,9 @@ matrix:
script:
- mkdir build
- cd build
- cmake ..
- cmake .. -DENABLE_SDL=ON -DENABLE_OPENAL=ON
- make -j2
# - xvfb-run ./visualboyadvance-m --help
- xvfb-run ./visualboyadvance-m --help
cache:
directories:
- "$HOME/.ccache"
@@ -31,7 +31,7 @@ matrix:
script:
- mkdir build
- cd build
- /usr/lib/mxe/usr/bin/x86_64-w64-mingw32.static-cmake ..
- /usr/lib/mxe/usr/bin/x86_64-w64-mingw32.static-cmake .. -DENABLE_SDL=ON -DENABLE_OPENAL=ON
- make -j2
cache:
directories:
@@ -45,7 +45,7 @@ matrix:
script:
- mkdir build
- cd build
- /usr/lib/mxe/usr/bin/i686-w64-mingw32.static-cmake ..
- /usr/lib/mxe/usr/bin/i686-w64-mingw32.static-cmake .. -DENABLE_SDL=ON -DENABLE_OPENAL=ON
- make -j2
cache:
directories:
@@ -66,17 +66,19 @@ matrix:
- env: BUILD_ENV=mac
language: cpp
os: osx
osx_image: xcode10.2
before_script:
- ./installdeps
script:
- mkdir build
- cd build
- cmake ..
- cmake .. -DENABLE_SDL=ON -DENABLE_OPENAL=ON -DENABLE_LINK=ON
- make -j2
# - ./visualboyadvance-m.app/Contents/MacOS/visualboyadvance-m --help
cache:
directories:
- "$HOME/.ccache"
- /usr/local

notifications:
webhooks:
@@ -4,6 +4,76 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [2.1.3] Windows Geometry Fix
=======================
* ac35e37c - fix game geometry on windows (4 hours ago)
* 9fa544d1 - cmake: wxWidgets Release config for visual studio (4 hours ago)
* 3cacb363 - libretro: put " " between version and git sha (25 hours ago)
* c2656f13 - libretro: remove "-" between version and git sha (26 hours ago)
* 4203bb53 - libretro: set version with git sha (27 hours ago)
* 8abbb070 - cmake: use Win32Deps when mingw cross compiling (28 hours ago)
* ffc93092 - builder: freetype 2.9.1 -> 2.10.0, verbose make (28 hours ago)
* d08dd6cd - builder: opensuse update 2 (2 days ago)
* 9b38a384 - builder: updates for opensuse, refactor cross deps (2 days ago)
* d28fd302 - cmake: only link SetupAPI on win32 if it's found (2 days ago)
* af63a119 - cmake: add -lSetupAPI to SDL2 libs for win32 (3 days ago)
* 04c77a26 - update win32 dependencies submodule (4 days ago)
* 5dfb36ad - remove .clang-format, update .travis.yml (4 days ago)
* ed16d625 - add unistd.h compat header for visual studio (4 days ago)
* 5019a201 - [SDL Front] MSVC doesn't have an unistd.h system file, closest is io.h, this will fix building the SDL frontend with msvc again. (7 days ago)
* 2ae72f38 - fix starting game pos and geometry #406 (8 days ago)
* 2beb5618 - cmake: move wx funcs and macros into separate file (9 days ago)
* 468fe266 - fix lang in changelog, add bios to issue template (11 days ago)

## [2.1.2] Analog stick fix
=======================
* 95433f6c - release v2.1.2 (81 minutes ago)
* 5b9d1a71 - cmake: improve finding wx utils (19 hours ago)
* 836b74a1 - remove DOS line-ends from src/wx/xrc/*.xrc (2 days ago)
* 49205bf2 - remove unused "multithread filter" menu item (2 days ago)
* 331d9d33 - Fix compilation warnings for MacOS build. (3 days ago)
* 5540790f - fix some compilation warnings (12 days ago)
* d9197281 - Fix for resizing window geometry when loading games. (3 days ago)
* 64a9c094 - fix analog stick regression from e57beed8 #400 (5 days ago)
* 0f0d2400 - more specific check for 3.1.2 xrc error (5 days ago)
* d9a7df61 - fix if statement in SDL sound driver #396 (5 days ago)
* 41ee35f2 - add *.dll to .gitignore (5 days ago)
* 6ec46678 - installdeps: centos: do not install wx 2.8 (9 days ago)
* 2097b5aa - wx 2.8 compat fixes, centos support, cmake fixes (9 days ago)
* b69fced7 - cmake: refactor, better clang support (11 days ago)
* 7fb27c4d - cmake: check for broken LTO (11 days ago)
* f2e9dc55 - cmake: check for policy CMP0077 existence (11 days ago)
* ae38a70d - cmake: gcc/clang colors with ninja, fix warnings (12 days ago)
* 23fe13d8 - cmake: fix syntax error in Win32Deps.cmake (2 weeks ago)
* 59e9c690 - reset Xorg screensaver on joy events (2 weeks ago)
* a0283ead - fix game panel size on wxGTK #325 (2 weeks ago)
* f1ecd7c3 - auto deps for visual studio, take 1 (2 weeks ago)
* 3da07f40 - detect llvm toolchain utilities #392 (3 weeks ago)
* c714ff82 - fix problems of command line parameters (3 weeks ago)
* a1f0c34a - XDG followup work #94 (3 weeks ago)
* 2142a46d - Revert "travis: try re-enabling binary check" (3 weeks ago)
* 101fac59 - travis: try re-enabling binary sanity check (3 weeks ago)
* 6ca59412 - travis: disable mxe pkg key (3 weeks ago)
* a57e51f6 - Return non-error code for given command line parameters. (3 weeks ago)
* 3fd444da - XDG related cleanups #94 (3 weeks ago)
* 513b0559 - minor travis update for mingw jobs (4 weeks ago)
* 1ebb8efd - Fix to set correctly position Y. (4 weeks ago)
* 944c263e - auto save/load geometry for wx GUI #94 (4 weeks ago)
* 36fbf715 - travis update attempt 5 (4 weeks ago)
* 77bcbbf4 - travis update attempt 4 (4 weeks ago)
* 7b3a3a0c - travis update attempt 3 (4 weeks ago)
* 8f0a578a - travis update attempt 2 (4 weeks ago)
* dbd1d8c1 - attempt to re-enable travis mingw slaves (4 weeks ago)
* 530af140 - rpi plugins fix + paths enhancements #94 (4 weeks ago)
* 6a98f3c2 - define S_ISDIR for win32 #94 (4 weeks ago)
* 7373da15 - Fix segmentation fault issue when using WX port command line on Linux and MacOS. (4 weeks ago)
* 36453885 - XDG Base Dir Spec followup #383 (4 weeks ago)
* 39fd3f65 - add note to README.md about translations (5 weeks ago)
* 24fd4e91 - move factory reset to help menu (5 weeks ago)
* 5835dafe - translate battery save error #318 (5 weeks ago)
* d2922cfc - stop showing "wrote battery" msg on panel #318 (5 weeks ago)
* 646557e2 - Add support for the XDG Base Dir Spec for Linux with legacy support. (5 weeks ago)
## [2.1.1] Various fixes to core and GUI
=======================
* 286d7ee9 - builder: fix 32bit mac build (16 hours ago) <Rafael Kitover>
@@ -6,19 +6,16 @@ if(COMMAND cmake_policy)
cmake_policy(SET CMP0077 NEW) # use vars for options
endif()

if(NOT CMAKE_VERSION VERSION_LESS 3.0)
if(POLICY CMP0043)
cmake_policy(SET CMP0043 NEW) # for wxWidgets, use generator expressions
endif()
endif()

option(ENABLE_VCPKG "Use dependencies for Visual Studio from vcpkg" ON)

set(NLS_DEFAULT ON)
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)

# get win32 deps before project declaration, because toolchain is set for vcpkg
set(VCPKG_DEPS zlib libpng SDL2 SFML gettext wxWidgets)

include(${CMAKE_SOURCE_DIR}/cmake/Win32Deps.cmake)
include(Set-Toolchain-vcpkg)

project(VBA-M C CXX)

@@ -34,7 +31,6 @@ endif()

set(ALL_TARGETS fex visualboyadvance-m vbamcore vbam)

set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
#Output all binaries at top level
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})

@@ -118,13 +114,34 @@ set(LTO_DEFAULT ON)

# lto produces buggy binaries for 64 bit win32
# and we generally don't want it when debugging because it makes linking slow
if((WIN32 AND CMAKE_COMPILER_IS_GNUCXX AND AMD64) OR CMAKE_BUILD_TYPE MATCHES Debug)
if(CMAKE_BUILD_TYPE MATCHES Debug OR (WIN32 AND CMAKE_COMPILER_IS_GNUCXX AND AMD64))
set(LTO_DEFAULT OFF)
endif()

option(ENABLE_LTO "Compile with Link Time Optimization (gcc and clang only)" ${LTO_DEFAULT})

if(WIN32 OR CMAKE_TOOLCHAIN_FILE MATCHES "[Mm][Ii][Nn][Gg][Ww]")
# Win32 deps submodule
if(NOT EXISTS "${CMAKE_SOURCE_DIR}/dependencies/mingw-xaudio/include")
set(git_checkout FALSE)

if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
set(git_checkout TRUE)
execute_process(
COMMAND git submodule update --init --remote --recursive
RESULT_VARIABLE git_status
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
)
endif()

if(NOT (git_checkout AND git_status EQUAL 0))
message(FATAL_ERROR "Please pull in git submodules, e.g.\nrun: git submodule update --init --remote --recursive")
endif()
endif()
endif()

if(MSVC)
include_directories("${CMAKE_SOURCE_DIR}/dependencies/msvc")
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
endif()

@@ -200,6 +217,10 @@ find_package(ZLIB REQUIRED)

set(OpenGL_GL_PREFERENCE GLVND)

if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
set(OpenGL_GL_PREFERENCE LEGACY)
endif()

find_package(OpenGL REQUIRED)

find_package(PNG REQUIRED)
@@ -219,6 +240,14 @@ endif()
find_package(SDL2 REQUIRED)
add_definitions(${SDL2_DEFINITIONS})

if(WIN32)
find_library(SETUPAPI_LIBRARY SetupAPI)

if(SETUPAPI_LIBRARY)
set(SDL2_LIBRARY ${SDL2_LIBRARY} ${SETUPAPI_LIBRARY})
endif()
endif()

if(ENABLE_LINK)
# msys2 does not have static sfml libs atm
# while on mxe we use static libs
@@ -496,6 +525,11 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
set(MY_C_FLAGS ${MY_C_FLAGS} ${MY_C_OPT_FLAGS} -Wno-error)
endif()

# for some reason this is necessary
if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
set(MY_C_FLAGS -I/usr/local/include ${MY_C_FLAGS})
endif()

foreach(C_COMPILE_FLAG ${MY_C_FLAGS})
add_compile_options(${C_COMPILE_FLAG})
endforeach()
@@ -921,5 +955,4 @@ set(CPACK_PACKAGE_VERSION_MAJOR "2")
set(CPACK_PACKAGE_VERSION_MINOR "0")
set(CPACK_PACKAGE_VERSION_PATCH "0-Git-" ${COMMITHASH})
list(APPEND CPACK_SOURCE_IGNORE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/dependencies")
list(APPEND CPACK_SOURCE_IGNORE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg")
include(CPack)

0 comments on commit b147e91

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