Merge pull request #57 from retro-wertz/sync

update
visualboyadvance-m · Jul 17, 2019 · b147e91 · b147e91
2 parents 8cb4200 + d808297
commit b147e91
Show file tree

Hide file tree

Showing 157 changed files with 50,896 additions and 44,325 deletions.
diff --git a/.clang-format b/.clang-format
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -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):

diff --git a/.gitignore b/.gitignore
@@ -7,9 +7,11 @@ src/wx/wxvbam.xrs
 build/*
 build32/*
 vsbuild/*
+cmake-build*
 dependencies/*
 vcpkg/*
 .vs/*
+.idea
 *.o
 *.so
 *.dll

diff --git a/.gitmodules b/.gitmodules
@@ -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
diff --git a/.travis.yml b/.travis.yml
@@ -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:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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>

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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)