ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
visualboyadvance-m/CMakeLists.txt

1147 lines
32 KiB
CMake
Raw Normal View History

auto deps for visual studio, take 1 Use vcpkg to build deps when Visual Studio on Windows is detected, this only happens on first build, but does take a while because things like wxWidgets need to be built. Building from the developer command line is also supported. I considered making a pre-built tarball available, but the resulting files are just too big for this to be practical. Make the necessary cmake code changes for this to work and to use the vcpkg packages, which work just like on linux or have other cmake glue code available. To do this, we make vcpkg a submodule, use git to checkout all submodules, then just build and use the `vcpkg.exe`. Then we set the CMAKE_TOOLCHAIN_FILE to the vcpkg toolchain and also include it directly, why this is necessary I don't know, without it it doesn't work in the IDE but does on the command line. All of this requires no vcpkg integration with either the user or the project. A user-wide `ENV{VCPKG_ROOT}` is also supported. Fix the dynamic arrays in the GBA core, MSVC follows the C++ standard on this and gcc does not. TODO: add the necessary gcc flags to make this an error in cmake. Use `wxArrayString` instead of `std::vector<wxString>` in `src/wx/strutils.cpp` which is used in options parsing. This was necessary because of a bizarre linker error with wxWidgets when using Visual Studio: https://trac.wxwidgets.org/ticket/10884#comment:46 In `src/wx/panel.cpp` make sure the unimplemented D3D renderer code does not get compiled if it's actually `OFF`. Also fix the new spacer code for the drawing panel to not combine `wxEXPAND` with `wxALIGN_CENTER`, which is an error on wxWidgets 3.1.2, which is what vcpkg uses. The drawing panel seems to be automatically stretched to the max size automatically anyway. TODO: if all of this works, we'll need an Appveyor set up for visual studio. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-21 23:01:46 +00:00
if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW) # link to full path of libs
cmake_policy(SET CMP0005 NEW) # escapes in add_definitions
cmake: check for policy CMP0077 existence Check `if(POLICY CMP0077)` before trying to set it, because setting a policy a version of cmake does not know about is an error. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-26 13:40:35 +00:00
cmake: Fix fedora mingw build + misc improvements. Use the 3.x wxwidgets mingw package in installdeps. Add the win64 alias to installdeps for 64 bit mingw builds, like the win32 alias for 32 bit mingw builds. Check CROSS_ARCH in Architecture.cmake, set by our mingw toolchains. Disable LTO by default for all mingw builds, not just amd64, because it is unfortunately broken on i686 as well now. Search for heuristically the most appropriate wx-config and set wxWidgets_CONFIG_EXECUTABLE accordingly in the mingw toolchains. Refactor the mingw toolchains somewhat, put common code into a common file, add static toolchains. For static toolchains, also search for a static zlib and set ZLIB_ROOT. Change installdeps instructions to use ninja instead of make. Add ninja to all target dependencies where it was missing, this may be incorrect in a couple of the rarely used targets, if this is the case the affected users are free to open an issue. Also start using ninja on travis instead of make, except for libretro which uses a GNU Makefile. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2020-02-01 16:43:08 +00:00
if(POLICY CMP0074)
cmake_policy(SET CMP0074 NEW) # use Package_ROOT if set
endif()
cmake: check for policy CMP0077 existence Check `if(POLICY CMP0077)` before trying to set it, because setting a policy a version of cmake does not know about is an error. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-26 13:40:35 +00:00
if(POLICY CMP0077)
cmake_policy(SET CMP0077 NEW) # use vars for options
endif()
cmake: gcc/clang colors with ninja, fix warnings Ninja requires `-fdiagnostics-color=always` instead of `-fdiagnostics-color=auto` with gcc because it pipes output from the compiler unlike regular makes. Use `-fcolor-diagnostics` for clang, which also works correctly with ninja to show colors. Information for this taken from here: https://medium.com/@alasher/colored-c-compiler-output-with-ninja-clang-gcc-10bfe7f2b949 Set all cmake policies in both the root `CMakeLists.txt` and `src/wx/CMakeLists.txt` to silence warnings about unset policies from cmake. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-26 00:35:23 +00:00
cmake: use Win32Deps when mingw cross compiling So that dependencies submodule is cloned. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-04-16 13:07:51 +00:00
if(POLICY CMP0043)
cmake: gcc/clang colors with ninja, fix warnings Ninja requires `-fdiagnostics-color=always` instead of `-fdiagnostics-color=auto` with gcc because it pipes output from the compiler unlike regular makes. Use `-fcolor-diagnostics` for clang, which also works correctly with ninja to show colors. Information for this taken from here: https://medium.com/@alasher/colored-c-compiler-output-with-ninja-clang-gcc-10bfe7f2b949 Set all cmake policies in both the root `CMakeLists.txt` and `src/wx/CMakeLists.txt` to silence warnings about unset policies from cmake. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-26 00:35:23 +00:00
cmake_policy(SET CMP0043 NEW) # for wxWidgets, use generator expressions
endif()
Add Catch2 unit testing framework + some tests. Add the Catch2 headers to third_party/include/catch2. Add Catch.cmake and CatchAddTests.cmake to cmake/. Add unit tests src/wx/tests/strutils.cpp using Catch2 to test src/wx/strutils.cpp. Make some code changes to strutils.cpp to make the tests pass. See src/wx/tests/CMakeLists.txt for how to set up unit test files; they plug into the normal CTest mechanism in cmake. The test binaries are written to the tests/ subdirectory of the build directory. Building the tests and enabling the CTest support can be turned off by passing -DBUILD_TESTING=OFF to cmake, the default is ON, this is the standard mechanism. Start running ctest on travis and appveyor. Move stb to third_party/include where Catch2 is now as well. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2020-07-10 13:40:05 +00:00
if(POLICY CMP0048)
cmake_policy(SET CMP0048 NEW) # set CMAKE_PROJECT_VERSION*
endif()
auto deps for visual studio, take 1 Use vcpkg to build deps when Visual Studio on Windows is detected, this only happens on first build, but does take a while because things like wxWidgets need to be built. Building from the developer command line is also supported. I considered making a pre-built tarball available, but the resulting files are just too big for this to be practical. Make the necessary cmake code changes for this to work and to use the vcpkg packages, which work just like on linux or have other cmake glue code available. To do this, we make vcpkg a submodule, use git to checkout all submodules, then just build and use the `vcpkg.exe`. Then we set the CMAKE_TOOLCHAIN_FILE to the vcpkg toolchain and also include it directly, why this is necessary I don't know, without it it doesn't work in the IDE but does on the command line. All of this requires no vcpkg integration with either the user or the project. A user-wide `ENV{VCPKG_ROOT}` is also supported. Fix the dynamic arrays in the GBA core, MSVC follows the C++ standard on this and gcc does not. TODO: add the necessary gcc flags to make this an error in cmake. Use `wxArrayString` instead of `std::vector<wxString>` in `src/wx/strutils.cpp` which is used in options parsing. This was necessary because of a bizarre linker error with wxWidgets when using Visual Studio: https://trac.wxwidgets.org/ticket/10884#comment:46 In `src/wx/panel.cpp` make sure the unimplemented D3D renderer code does not get compiled if it's actually `OFF`. Also fix the new spacer code for the drawing panel to not combine `wxEXPAND` with `wxALIGN_CENTER`, which is an error on wxWidgets 3.1.2, which is what vcpkg uses. The drawing panel seems to be automatically stretched to the max size automatically anyway. TODO: if all of this works, we'll need an Appveyor set up for visual studio. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-21 23:01:46 +00:00
endif()
update Visual Studio support Replace the vcpkg code with a newer and better version. In this version the `vcpkg` directory is on the same level as the source directory, so that IntelliSense does not get confused scanning for files. The cmake variable `VCPKG_TARGET_TRIPLET` is required to activate vcpkg support, it must be set to e.g. `x64-windows` or `x86-windows`. Update `CMakeSettings.json` for the new code for the GUI. Fix a problem copying the `SDL2.dll` file to the binary directory. Update `README.md` with commandline instructions. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-07-03 23:28:48 +00:00
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
auto deps for visual studio, take 1 Use vcpkg to build deps when Visual Studio on Windows is detected, this only happens on first build, but does take a while because things like wxWidgets need to be built. Building from the developer command line is also supported. I considered making a pre-built tarball available, but the resulting files are just too big for this to be practical. Make the necessary cmake code changes for this to work and to use the vcpkg packages, which work just like on linux or have other cmake glue code available. To do this, we make vcpkg a submodule, use git to checkout all submodules, then just build and use the `vcpkg.exe`. Then we set the CMAKE_TOOLCHAIN_FILE to the vcpkg toolchain and also include it directly, why this is necessary I don't know, without it it doesn't work in the IDE but does on the command line. All of this requires no vcpkg integration with either the user or the project. A user-wide `ENV{VCPKG_ROOT}` is also supported. Fix the dynamic arrays in the GBA core, MSVC follows the C++ standard on this and gcc does not. TODO: add the necessary gcc flags to make this an error in cmake. Use `wxArrayString` instead of `std::vector<wxString>` in `src/wx/strutils.cpp` which is used in options parsing. This was necessary because of a bizarre linker error with wxWidgets when using Visual Studio: https://trac.wxwidgets.org/ticket/10884#comment:46 In `src/wx/panel.cpp` make sure the unimplemented D3D renderer code does not get compiled if it's actually `OFF`. Also fix the new spacer code for the drawing panel to not combine `wxEXPAND` with `wxALIGN_CENTER`, which is an error on wxWidgets 3.1.2, which is what vcpkg uses. The drawing panel seems to be automatically stretched to the max size automatically anyway. TODO: if all of this works, we'll need an Appveyor set up for visual studio. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-21 23:01:46 +00:00
cmake: Add UPDATE_APPCAST script for appcast.xml. Add the -DUPDATE_APPCAST=TRUE option to invoke the UpdateAppcast.cmake script, which clones the github pages repo and sets the version in the appcast.xml to the last tag, presumably made with -DTAG_RELEASE. The script prints out a final set of instructions to actually push the change to git. If the option -DUPDATE_APPCAST=UNDO is used, the clone is removed and no changes are made. Also use the correct method of splitting the tag list output into multiple lines. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2020-02-08 22:53:53 +00:00
if(UPDATE_APPCAST)
include(UpdateAppcast)
endif()
cmake: Check UPDATE_APPCAST before TAG_RELEASE. Check for UPDATE_APPCAST being set before checking for TAG_RELEASE, as the UPDATE_APPCAST script may be run in the same build directory where TAG_RELEASE was just run. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2020-02-08 23:22:31 +00:00
if(TAG_RELEASE)
include(MakeReleaseCommitAndTag)
endif()
Only build ffmpeg with vcpkg if installs < 30m. Fix the problem with vcpkg installs including both wxWidgets and ffmpeg overrunning the one hour time limit, by making ffmpeg optional and only building it if the other builds are under 30 minutes. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2020-08-17 17:12:35 +00:00
set(VCPKG_DEPS zlib SDL2 SFML gettext wxWidgets)
set(VCPKG_DEPS_OPTIONAL ffmpeg ENABLE_FFMPEG)
cmake: Visual Studio support improvements. Add support for vcpkg ffmpeg, this requires using someone's FindFFmpeg.cmake instead of relying on pkg-config, since vcpkg does not have pkg-config. Do not use the ffmpeg from vcpkg on appveyor however, because that pushes the build cache generation over the time limit for jobs. Add secur32 and bcrypt to the list of ffmpeg libs on windows, these are standard windows libraries. Change some code in ffmpeg.cpp to remove C-style casts of struct initializers, which are illegal in MSVC. Add the INT64_C and UINT64_C macros missing in MSVC's stdint.h (if not defined) to ffmpeg.h before the ffmpeg headers are included, because they rely on them. Rewrite the wxWidgets finding code for the vcpkg wxWidgets to be nicer and work correctly for debug and static builds. Remove all /W* and /w* warnings options from cmake compiler flags, and replace them with /W4 for debug builds, and /w (no warnings) for release modes. When building a static binary, remove all /MD* flags from cmake compiler flags, and use /MT for static release builds and /MTd for static debug builds. Improve the vcpkg toolchain wrapper to only rebuild the vcpkg binary if there were git updates. Redo the handling of SDL2 and SDL_main. Only link SDL2Main to the SDL binary and don't use the definitions. Update CMakeSettings.json to use Ninja and include static configurations. Use CMAKE_PROJECT_DIR instead of CMAKE_SOURCE_DIR to determine the vcpkg root, as CMAKE_SOURCE_DIR is sometimes set incorrectly in the 2017 GUI. Add /nodefaultlib:libcmt to the debug build link flags, as in debug builds libcmtd is used and libcmt should not be. Add /subsystem:console to debug build link flags to produce a windows console app for debug builds, like we do for mingw builds. To do this, define a WIN32_CONSOLE_APP macro and if set, define a main() that calls WinMain(). Call wxMesdsageOutput::Set() in OnInit with an instance of wxMessageOutputStderr for windows debug builds to make sure the --help text etc. goes to the console instead of a popup box. Update the Visual Studio related text in README.md. Fix dynamic debug builds by linking to the debug version of SDL2 and copying the debug version of the dll to the build dir. Fix issue in MainFrame::BindAppIcon with the function we are using not being found in a Windows DLL in debug builds by using wxDynamicLibrary::GetSymboolAorW() instead of GetSymbol(). Enable LTO for MSVC in Release modes, if the option is set. Change appveyor config to use an 8 item build matrix of x64/x86 / Release/Debug / Static/Dynamic. And test the binary in debug modes by running --help. When copying the wxrc.exe out of the build tree, copy both the release and debug versions, this is so that appveyor caching of vcpkg works, since the build trees are not cached. Add some necessary win32 libraries to the SDL binary. And enable building it on appveyor. Fix #465. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-10 11:13:58 +00:00
update Visual Studio support Replace the vcpkg code with a newer and better version. In this version the `vcpkg` directory is on the same level as the source directory, so that IntelliSense does not get confused scanning for files. The cmake variable `VCPKG_TARGET_TRIPLET` is required to activate vcpkg support, it must be set to e.g. `x64-windows` or `x86-windows`. Update `CMakeSettings.json` for the new code for the GUI. Fix a problem copying the `SDL2.dll` file to the binary directory. Update `README.md` with commandline instructions. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-07-03 23:28:48 +00:00
include(Set-Toolchain-vcpkg)
auto deps for visual studio, take 1 Use vcpkg to build deps when Visual Studio on Windows is detected, this only happens on first build, but does take a while because things like wxWidgets need to be built. Building from the developer command line is also supported. I considered making a pre-built tarball available, but the resulting files are just too big for this to be practical. Make the necessary cmake code changes for this to work and to use the vcpkg packages, which work just like on linux or have other cmake glue code available. To do this, we make vcpkg a submodule, use git to checkout all submodules, then just build and use the `vcpkg.exe`. Then we set the CMAKE_TOOLCHAIN_FILE to the vcpkg toolchain and also include it directly, why this is necessary I don't know, without it it doesn't work in the IDE but does on the command line. All of this requires no vcpkg integration with either the user or the project. A user-wide `ENV{VCPKG_ROOT}` is also supported. Fix the dynamic arrays in the GBA core, MSVC follows the C++ standard on this and gcc does not. TODO: add the necessary gcc flags to make this an error in cmake. Use `wxArrayString` instead of `std::vector<wxString>` in `src/wx/strutils.cpp` which is used in options parsing. This was necessary because of a bizarre linker error with wxWidgets when using Visual Studio: https://trac.wxwidgets.org/ticket/10884#comment:46 In `src/wx/panel.cpp` make sure the unimplemented D3D renderer code does not get compiled if it's actually `OFF`. Also fix the new spacer code for the drawing panel to not combine `wxEXPAND` with `wxALIGN_CENTER`, which is an error on wxWidgets 3.1.2, which is what vcpkg uses. The drawing panel seems to be automatically stretched to the max size automatically anyway. TODO: if all of this works, we'll need an Appveyor set up for visual studio. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-21 23:01:46 +00:00
cmake: Visual Studio support improvements. Add support for vcpkg ffmpeg, this requires using someone's FindFFmpeg.cmake instead of relying on pkg-config, since vcpkg does not have pkg-config. Do not use the ffmpeg from vcpkg on appveyor however, because that pushes the build cache generation over the time limit for jobs. Add secur32 and bcrypt to the list of ffmpeg libs on windows, these are standard windows libraries. Change some code in ffmpeg.cpp to remove C-style casts of struct initializers, which are illegal in MSVC. Add the INT64_C and UINT64_C macros missing in MSVC's stdint.h (if not defined) to ffmpeg.h before the ffmpeg headers are included, because they rely on them. Rewrite the wxWidgets finding code for the vcpkg wxWidgets to be nicer and work correctly for debug and static builds. Remove all /W* and /w* warnings options from cmake compiler flags, and replace them with /W4 for debug builds, and /w (no warnings) for release modes. When building a static binary, remove all /MD* flags from cmake compiler flags, and use /MT for static release builds and /MTd for static debug builds. Improve the vcpkg toolchain wrapper to only rebuild the vcpkg binary if there were git updates. Redo the handling of SDL2 and SDL_main. Only link SDL2Main to the SDL binary and don't use the definitions. Update CMakeSettings.json to use Ninja and include static configurations. Use CMAKE_PROJECT_DIR instead of CMAKE_SOURCE_DIR to determine the vcpkg root, as CMAKE_SOURCE_DIR is sometimes set incorrectly in the 2017 GUI. Add /nodefaultlib:libcmt to the debug build link flags, as in debug builds libcmtd is used and libcmt should not be. Add /subsystem:console to debug build link flags to produce a windows console app for debug builds, like we do for mingw builds. To do this, define a WIN32_CONSOLE_APP macro and if set, define a main() that calls WinMain(). Call wxMesdsageOutput::Set() in OnInit with an instance of wxMessageOutputStderr for windows debug builds to make sure the --help text etc. goes to the console instead of a popup box. Update the Visual Studio related text in README.md. Fix dynamic debug builds by linking to the debug version of SDL2 and copying the debug version of the dll to the build dir. Fix issue in MainFrame::BindAppIcon with the function we are using not being found in a Windows DLL in debug builds by using wxDynamicLibrary::GetSymboolAorW() instead of GetSymbol(). Enable LTO for MSVC in Release modes, if the option is set. Change appveyor config to use an 8 item build matrix of x64/x86 / Release/Debug / Static/Dynamic. And test the binary in debug modes by running --help. When copying the wxrc.exe out of the build tree, copy both the release and debug versions, this is so that appveyor caching of vcpkg works, since the build trees are not cached. Add some necessary win32 libraries to the SDL binary. And enable building it on appveyor. Fix #465. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-10 11:13:58 +00:00
set(VBAM_STATIC_DEFAULT OFF)
cmake: Fix fedora mingw build + misc improvements. Use the 3.x wxwidgets mingw package in installdeps. Add the win64 alias to installdeps for 64 bit mingw builds, like the win32 alias for 32 bit mingw builds. Check CROSS_ARCH in Architecture.cmake, set by our mingw toolchains. Disable LTO by default for all mingw builds, not just amd64, because it is unfortunately broken on i686 as well now. Search for heuristically the most appropriate wx-config and set wxWidgets_CONFIG_EXECUTABLE accordingly in the mingw toolchains. Refactor the mingw toolchains somewhat, put common code into a common file, add static toolchains. For static toolchains, also search for a static zlib and set ZLIB_ROOT. Change installdeps instructions to use ninja instead of make. Add ninja to all target dependencies where it was missing, this may be incorrect in a couple of the rarely used targets, if this is the case the affected users are free to open an issue. Also start using ninja on travis instead of make, except for libretro which uses a GNU Makefile. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2020-02-01 16:43:08 +00:00
if(VCPKG_TARGET_TRIPLET MATCHES -static OR CMAKE_TOOLCHAIN_FILE MATCHES "mxe|-static")
cmake: Visual Studio support improvements. Add support for vcpkg ffmpeg, this requires using someone's FindFFmpeg.cmake instead of relying on pkg-config, since vcpkg does not have pkg-config. Do not use the ffmpeg from vcpkg on appveyor however, because that pushes the build cache generation over the time limit for jobs. Add secur32 and bcrypt to the list of ffmpeg libs on windows, these are standard windows libraries. Change some code in ffmpeg.cpp to remove C-style casts of struct initializers, which are illegal in MSVC. Add the INT64_C and UINT64_C macros missing in MSVC's stdint.h (if not defined) to ffmpeg.h before the ffmpeg headers are included, because they rely on them. Rewrite the wxWidgets finding code for the vcpkg wxWidgets to be nicer and work correctly for debug and static builds. Remove all /W* and /w* warnings options from cmake compiler flags, and replace them with /W4 for debug builds, and /w (no warnings) for release modes. When building a static binary, remove all /MD* flags from cmake compiler flags, and use /MT for static release builds and /MTd for static debug builds. Improve the vcpkg toolchain wrapper to only rebuild the vcpkg binary if there were git updates. Redo the handling of SDL2 and SDL_main. Only link SDL2Main to the SDL binary and don't use the definitions. Update CMakeSettings.json to use Ninja and include static configurations. Use CMAKE_PROJECT_DIR instead of CMAKE_SOURCE_DIR to determine the vcpkg root, as CMAKE_SOURCE_DIR is sometimes set incorrectly in the 2017 GUI. Add /nodefaultlib:libcmt to the debug build link flags, as in debug builds libcmtd is used and libcmt should not be. Add /subsystem:console to debug build link flags to produce a windows console app for debug builds, like we do for mingw builds. To do this, define a WIN32_CONSOLE_APP macro and if set, define a main() that calls WinMain(). Call wxMesdsageOutput::Set() in OnInit with an instance of wxMessageOutputStderr for windows debug builds to make sure the --help text etc. goes to the console instead of a popup box. Update the Visual Studio related text in README.md. Fix dynamic debug builds by linking to the debug version of SDL2 and copying the debug version of the dll to the build dir. Fix issue in MainFrame::BindAppIcon with the function we are using not being found in a Windows DLL in debug builds by using wxDynamicLibrary::GetSymboolAorW() instead of GetSymbol(). Enable LTO for MSVC in Release modes, if the option is set. Change appveyor config to use an 8 item build matrix of x64/x86 / Release/Debug / Static/Dynamic. And test the binary in debug modes by running --help. When copying the wxrc.exe out of the build tree, copy both the release and debug versions, this is so that appveyor caching of vcpkg works, since the build trees are not cached. Add some necessary win32 libraries to the SDL binary. And enable building it on appveyor. Fix #465. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-10 11:13:58 +00:00
set(VBAM_STATIC_DEFAULT ON)
endif()
Refactor cmake ccache support and support MSVC. Don't disable ccache for msys+ninja anymore, since the mingw ccache works now and there is no reason to use the msys ccache anymore. Use RULE_LAUNCH_COMPILE only on cmake versions < 3.4.0, because this currently breaks resource compilation with visual studio and the windows native ccache from chocolatey, this needs to be fixed in ccache. On cmake 3.4.0 and greater, set the variables CMAKE_<LANG>_COMPILER_LAUNCHER instead. This has the effect of using ccache for C, C++ and nasm, but not for the resource file, avoiding the problem with visual studio, which has a more recent cmake. This must be done before the project() call. TODO: Currently the Visual Studio build with ccache from chocolatey works correctly, ccache is being invoked from ninja, but no cache files are being created. This is being followed up with the chocolatey package maintainer and upstream if necessary. The resource compiler issue also needs to be fixed upstream. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2020-07-30 22:27:21 +00:00
# Use ccache if available and not already enabled on the command line.
# This has to be done before the project() call.
if(NOT (CMAKE_CXX_COMPILER_LAUNCHER OR CMAKE_CXX_COMPILER MATCHES ccache))
find_program(CCACHE_EXECUTABLE ccache)
if(CCACHE_EXECUTABLE)
message(STATUS "Enabling ccache")
if(CMAKE_VERSION VERSION_LESS 3.4.0)
# FIXME: This method currently breaks for native ccache on windows
# with the visual studio resource compiler.
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE_EXECUTABLE})
else()
set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_EXECUTABLE} CACHE STRING "C compiler launcher" FORCE)
set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_EXECUTABLE} CACHE STRING "C++ compiler launcher" FORCE)
set(CMAKE_ASM_NASM_COMPILER_LAUNCHER ${CCACHE_EXECUTABLE} CACHE STRING "nasm assembler launcher" FORCE)
endif()
endif()
endif()
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
project(VBA-M C CXX)
fix the cmake/linux build moves dependencies/File_Extractor-1.0.0 to trunk/fex - we can't expect people to have this lib, and fex has dropped support for the "fex_mini".
2010-03-15 03:36:45 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
cmake_minimum_required(VERSION 2.8.12)
compile/link flags improvements * Bump minimum cmake required to 3.3.2, to make sure generator expressions work. * Force CMAKE_BUILD_TYPE to "Release" if unset, not sure if this actually works. * Merge the older compile flags block with the new one and use generator expressions to make sure the relevant flags apply only to C, C++ or nasm. * Add -lssp to the end of the link commands for the -fstack-protector* options, this is only needed/done for gcc. * Add -lversion and -limm32 to SDL2_LIBRARY (Zach asked for this.) * Builds on msys2 again!
2016-11-20 19:11:52 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(NOT CMAKE_PREFIX_PATH AND (NOT ("$ENV{CMAKE_PREFIX_PATH}" STREQUAL "")))
set(CMAKE_PREFIX_PATH "$ENV{CMAKE_PREFIX_PATH}")
endif()
if(CMAKE_BUILD_TYPE STREQUAL "")
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build Type" FORCE)
endif()
compile/link flags improvements * Bump minimum cmake required to 3.3.2, to make sure generator expressions work. * Force CMAKE_BUILD_TYPE to "Release" if unset, not sure if this actually works. * Merge the older compile flags block with the new one and use generator expressions to make sure the relevant flags apply only to C, C++ or nasm. * Add -lssp to the end of the link commands for the -fstack-protector* options, this is only needed/done for gcc. * Add -lversion and -limm32 to SDL2_LIBRARY (Zach asked for this.) * Builds on msys2 again!
2016-11-20 19:11:52 +00:00
Add Catch2 unit testing framework + some tests. Add the Catch2 headers to third_party/include/catch2. Add Catch.cmake and CatchAddTests.cmake to cmake/. Add unit tests src/wx/tests/strutils.cpp using Catch2 to test src/wx/strutils.cpp. Make some code changes to strutils.cpp to make the tests pass. See src/wx/tests/CMakeLists.txt for how to set up unit test files; they plug into the normal CTest mechanism in cmake. The test binaries are written to the tests/ subdirectory of the build directory. Building the tests and enabling the CTest support can be turned off by passing -DBUILD_TESTING=OFF to cmake, the default is ON, this is the standard mechanism. Start running ctest on travis and appveyor. Move stb to third_party/include where Catch2 is now as well. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2020-07-10 13:40:05 +00:00
include(CTest)
if(BUILD_TESTING)
enable_testing()
endif()
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
set(ALL_TARGETS fex visualboyadvance-m vbamcore vbam)
add LTO support, fix libssp link, add -ggdb3 -Og Add support for Link Time Optimization (LTO) on gcc and Clang. Link libssp only when it is on the system, some toolchains like Ubuntu's do not require explicitly linking to libssp. On Win32 try to link it statically. In debug builds with GCC, use -ggdb3 -Og, otherwise use -g . Two new cmake modules were written for this: * FindSSP.cmake -- this is for finding libssp on the system. * UseGCCBinUtilsWrappers.cmake -- this is for using gcc binutils wrappers such as gcc-ar, which is required for gcc LTO to work. These will be distributed separately as well.
2016-11-21 20:37:21 +00:00
cmake: Silence cmake policy warning CMP0058. See: cmake --help-policy CMP0058
2019-10-05 02:37:05 +00:00
add_custom_target(generate)
cmakelists changes, wxwidgets interface build fix to follow.
2015-03-27 17:48:42 +00:00
#Output all binaries at top level
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
option(ENABLE_SDL "Build the SDL port" OFF)
option(ENABLE_WX "Build the wxWidgets port" ON)
option(ENABLE_DEBUGGER "Enable the debugger" ON)
cmake: support libasan/-fsanitize Add the ENABLE_ASAN cmake option, defaulting to `-fsanitize=address` if ON, or the value specified for the option.
2019-01-02 16:23:26 +00:00
option(ENABLE_ASAN "Enable -fsanitize=<option>, address by default, requires debug build" OFF)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
cmake: Visual Studio support improvements. Add support for vcpkg ffmpeg, this requires using someone's FindFFmpeg.cmake instead of relying on pkg-config, since vcpkg does not have pkg-config. Do not use the ffmpeg from vcpkg on appveyor however, because that pushes the build cache generation over the time limit for jobs. Add secur32 and bcrypt to the list of ffmpeg libs on windows, these are standard windows libraries. Change some code in ffmpeg.cpp to remove C-style casts of struct initializers, which are illegal in MSVC. Add the INT64_C and UINT64_C macros missing in MSVC's stdint.h (if not defined) to ffmpeg.h before the ffmpeg headers are included, because they rely on them. Rewrite the wxWidgets finding code for the vcpkg wxWidgets to be nicer and work correctly for debug and static builds. Remove all /W* and /w* warnings options from cmake compiler flags, and replace them with /W4 for debug builds, and /w (no warnings) for release modes. When building a static binary, remove all /MD* flags from cmake compiler flags, and use /MT for static release builds and /MTd for static debug builds. Improve the vcpkg toolchain wrapper to only rebuild the vcpkg binary if there were git updates. Redo the handling of SDL2 and SDL_main. Only link SDL2Main to the SDL binary and don't use the definitions. Update CMakeSettings.json to use Ninja and include static configurations. Use CMAKE_PROJECT_DIR instead of CMAKE_SOURCE_DIR to determine the vcpkg root, as CMAKE_SOURCE_DIR is sometimes set incorrectly in the 2017 GUI. Add /nodefaultlib:libcmt to the debug build link flags, as in debug builds libcmtd is used and libcmt should not be. Add /subsystem:console to debug build link flags to produce a windows console app for debug builds, like we do for mingw builds. To do this, define a WIN32_CONSOLE_APP macro and if set, define a main() that calls WinMain(). Call wxMesdsageOutput::Set() in OnInit with an instance of wxMessageOutputStderr for windows debug builds to make sure the --help text etc. goes to the console instead of a popup box. Update the Visual Studio related text in README.md. Fix dynamic debug builds by linking to the debug version of SDL2 and copying the debug version of the dll to the build dir. Fix issue in MainFrame::BindAppIcon with the function we are using not being found in a Windows DLL in debug builds by using wxDynamicLibrary::GetSymboolAorW() instead of GetSymbol(). Enable LTO for MSVC in Release modes, if the option is set. Change appveyor config to use an 8 item build matrix of x64/x86 / Release/Debug / Static/Dynamic. And test the binary in debug modes by running --help. When copying the wxrc.exe out of the build tree, copy both the release and debug versions, this is so that appveyor caching of vcpkg works, since the build trees are not cached. Add some necessary win32 libraries to the SDL binary. And enable building it on appveyor. Fix #465. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-10 11:13:58 +00:00
option(VBAM_STATIC "Try to link all libraries statically" ${VBAM_STATIC_DEFAULT})
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(VBAM_STATIC)
set(SDL2_STATIC ON)
set(SFML_STATIC_LIBRARIES ON)
set(FFMPEG_STATIC ON)
set(SSP_STATIC ON)
set(OPENAL_STATIC ON)
cmake: Fix fedora mingw build + misc improvements. Use the 3.x wxwidgets mingw package in installdeps. Add the win64 alias to installdeps for 64 bit mingw builds, like the win32 alias for 32 bit mingw builds. Check CROSS_ARCH in Architecture.cmake, set by our mingw toolchains. Disable LTO by default for all mingw builds, not just amd64, because it is unfortunately broken on i686 as well now. Search for heuristically the most appropriate wx-config and set wxWidgets_CONFIG_EXECUTABLE accordingly in the mingw toolchains. Refactor the mingw toolchains somewhat, put common code into a common file, add static toolchains. For static toolchains, also search for a static zlib and set ZLIB_ROOT. Change installdeps instructions to use ninja instead of make. Add ninja to all target dependencies where it was missing, this may be incorrect in a couple of the rarely used targets, if this is the case the affected users are free to open an issue. Also start using ninja on travis instead of make, except for libretro which uses a GNU Makefile. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2020-02-01 16:43:08 +00:00
set_property(GLOBAL PROPERTY LINK_SEARCH_START_STATIC ON)
set_property(GLOBAL PROPERTY LINK_SEARCH_END_STATIC ON)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
cmake: Fix fedora mingw build + misc improvements. Use the 3.x wxwidgets mingw package in installdeps. Add the win64 alias to installdeps for 64 bit mingw builds, like the win32 alias for 32 bit mingw builds. Check CROSS_ARCH in Architecture.cmake, set by our mingw toolchains. Disable LTO by default for all mingw builds, not just amd64, because it is unfortunately broken on i686 as well now. Search for heuristically the most appropriate wx-config and set wxWidgets_CONFIG_EXECUTABLE accordingly in the mingw toolchains. Refactor the mingw toolchains somewhat, put common code into a common file, add static toolchains. For static toolchains, also search for a static zlib and set ZLIB_ROOT. Change installdeps instructions to use ninja instead of make. Add ninja to all target dependencies where it was missing, this may be incorrect in a couple of the rarely used targets, if this is the case the affected users are free to open an issue. Also start using ninja on travis instead of make, except for libretro which uses a GNU Makefile. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2020-02-01 16:43:08 +00:00
if(NOT MSVC)
list(INSERT CMAKE_FIND_LIBRARY_SUFFIXES 0 .a)
endif()
auto deps for visual studio, take 1 Use vcpkg to build deps when Visual Studio on Windows is detected, this only happens on first build, but does take a while because things like wxWidgets need to be built. Building from the developer command line is also supported. I considered making a pre-built tarball available, but the resulting files are just too big for this to be practical. Make the necessary cmake code changes for this to work and to use the vcpkg packages, which work just like on linux or have other cmake glue code available. To do this, we make vcpkg a submodule, use git to checkout all submodules, then just build and use the `vcpkg.exe`. Then we set the CMAKE_TOOLCHAIN_FILE to the vcpkg toolchain and also include it directly, why this is necessary I don't know, without it it doesn't work in the IDE but does on the command line. All of this requires no vcpkg integration with either the user or the project. A user-wide `ENV{VCPKG_ROOT}` is also supported. Fix the dynamic arrays in the GBA core, MSVC follows the C++ standard on this and gcc does not. TODO: add the necessary gcc flags to make this an error in cmake. Use `wxArrayString` instead of `std::vector<wxString>` in `src/wx/strutils.cpp` which is used in options parsing. This was necessary because of a bizarre linker error with wxWidgets when using Visual Studio: https://trac.wxwidgets.org/ticket/10884#comment:46 In `src/wx/panel.cpp` make sure the unimplemented D3D renderer code does not get compiled if it's actually `OFF`. Also fix the new spacer code for the drawing panel to not combine `wxEXPAND` with `wxALIGN_CENTER`, which is an error on wxWidgets 3.1.2, which is what vcpkg uses. The drawing panel seems to be automatically stretched to the max size automatically anyway. TODO: if all of this works, we'll need an Appveyor set up for visual studio. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-21 23:01:46 +00:00
endif()
add Travis CI support Use a matrix of 4 jobs, linux (ubuntu trusty), mingw i686, mingw x86-64 and mac. Automatically detect ccache in the cmake config and cache the `~/.ccache` directory for faster rebuilds. Instructions for ccache in cmake are here: https://stackoverflow.com/a/24305849 Change build status badge in README.md to Travis.
2018-06-27 02:15:22 +00:00
disable gcc stack protector, segfault on 8.2.0 Make gcc -fstack-protector-strong and associated options controlled by the cmake option ENABLE_SSP which defaults to OFF. This option causes a segfault on startup with gcc 8.2.0.
2018-08-10 23:35:49 +00:00
set(SSP_DEFAULT OFF)
option(ENABLE_SSP "Enable gcc stack protector support" ${SSP_DEFAULT})
auto deps for visual studio, take 1 Use vcpkg to build deps when Visual Studio on Windows is detected, this only happens on first build, but does take a while because things like wxWidgets need to be built. Building from the developer command line is also supported. I considered making a pre-built tarball available, but the resulting files are just too big for this to be practical. Make the necessary cmake code changes for this to work and to use the vcpkg packages, which work just like on linux or have other cmake glue code available. To do this, we make vcpkg a submodule, use git to checkout all submodules, then just build and use the `vcpkg.exe`. Then we set the CMAKE_TOOLCHAIN_FILE to the vcpkg toolchain and also include it directly, why this is necessary I don't know, without it it doesn't work in the IDE but does on the command line. All of this requires no vcpkg integration with either the user or the project. A user-wide `ENV{VCPKG_ROOT}` is also supported. Fix the dynamic arrays in the GBA core, MSVC follows the C++ standard on this and gcc does not. TODO: add the necessary gcc flags to make this an error in cmake. Use `wxArrayString` instead of `std::vector<wxString>` in `src/wx/strutils.cpp` which is used in options parsing. This was necessary because of a bizarre linker error with wxWidgets when using Visual Studio: https://trac.wxwidgets.org/ticket/10884#comment:46 In `src/wx/panel.cpp` make sure the unimplemented D3D renderer code does not get compiled if it's actually `OFF`. Also fix the new spacer code for the drawing panel to not combine `wxEXPAND` with `wxALIGN_CENTER`, which is an error on wxWidgets 3.1.2, which is what vcpkg uses. The drawing panel seems to be automatically stretched to the max size automatically anyway. TODO: if all of this works, we'll need an Appveyor set up for visual studio. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-21 23:01:46 +00:00
set(ASM_DEFAULT OFF)
include(Architecture)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
option(ENABLE_ASM "Enable x86 ASM related options" ${ASM_DEFAULT})
add ENABLE_ASM cmake option Add the ENABLE_ASM flag for cmake which turns ON or OFF the ENABLE_ASM_CORE, ENABLE_ASM_SCALERS and the ENABLE_MMX options at once.
2017-03-06 09:40:55 +00:00
cmake: default to ENABLE_ASM_CORE=OFF #98 #54 The inline assembly in src/gba/GBA-thumb.cpp which is turned on with the cmake ENABLE_ASM_CORES option, sometimes causes weird behavior on windows (see: #54) and a crash on startup in linux (see: #98, confirmed on both Fedora and Arch Linux.) Previously the default for this option was ON for 32 bit builds, set the default to OFF always for the time being, until it is either fixed or replaced.
2017-03-19 02:04:39 +00:00
# The ARM ASM core seems to be very buggy, see #98 and #54. Default to it being
# OFF for the time being, until it is either fixed or replaced.
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
option(ENABLE_ASM_CORE "Enable x86 ASM CPU cores" OFF)
cmake: default to ENABLE_ASM_CORE=OFF #98 #54 The inline assembly in src/gba/GBA-thumb.cpp which is turned on with the cmake ENABLE_ASM_CORES option, sometimes causes weird behavior on windows (see: #54) and a crash on startup in linux (see: #98, confirmed on both Fedora and Arch Linux.) Previously the default for this option was ON for 32 bit builds, set the default to OFF always for the time being, until it is either fixed or replaced.
2017-03-19 02:04:39 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(ENABLE_ASM_CORE)
message(WARNING "!!!!!! The x86 ASM cores are considered buggy and dangerous, use at your own risk. !!!!!!")
endif()
cmake: default to ENABLE_ASM_CORE=OFF #98 #54 The inline assembly in src/gba/GBA-thumb.cpp which is turned on with the cmake ENABLE_ASM_CORES option, sometimes causes weird behavior on windows (see: #54) and a crash on startup in linux (see: #98, confirmed on both Fedora and Arch Linux.) Previously the default for this option was ON for 32 bit builds, set the default to OFF always for the time being, until it is either fixed or replaced.
2017-03-19 02:04:39 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
set(ASM_SCALERS_DEFAULT ${ENABLE_ASM})
set(MMX_DEFAULT ${ENABLE_ASM})
add ENABLE_ASM cmake option Add the ENABLE_ASM flag for cmake which turns ON or OFF the ENABLE_ASM_CORE, ENABLE_ASM_SCALERS and the ENABLE_MMX options at once.
2017-03-06 09:40:55 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
option(ENABLE_ASM_SCALERS "Enable x86 ASM graphic filters" ${ASM_SCALERS_DEFAULT})
fix 32bit build support Make ASM_CORE, ASM_SCALERS and ENABLE_MMX the defaults for 32bit builds on intel hosts (the host can be AMD64, as long as the target is 32bits.) Move mac nasm search into the mac section of the cmake code and stop defaulting to /usr/bin/nasm, this was screwing up the build on msys2. Fix src/filters/2xSaImmx.asm to compile and link correctly. Add nasm to list of mingw deps for ./installdeps-msys2 . Tested that msys2-built Wx binary runs, including with 2xSaI. Keyboard doesn't work yet on msys2 builds, but that's a completely different issue.
2016-11-18 16:59:27 +00:00
if(ENABLE_ASM_SCALERS)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
option(ENABLE_MMX "Enable MMX" ${MMX_DEFAULT})
endif()
fix 32bit build support Make ASM_CORE, ASM_SCALERS and ENABLE_MMX the defaults for 32bit builds on intel hosts (the host can be AMD64, as long as the target is 32bits.) Move mac nasm search into the mac section of the cmake code and stop defaulting to /usr/bin/nasm, this was screwing up the build on msys2. Fix src/filters/2xSaImmx.asm to compile and link correctly. Add nasm to list of mingw deps for ./installdeps-msys2 . Tested that msys2-built Wx binary runs, including with 2xSaI. Keyboard doesn't work yet on msys2 builds, but that's a completely different issue.
2016-11-18 16:59:27 +00:00
cmake: Visual Studio support improvements. Add support for vcpkg ffmpeg, this requires using someone's FindFFmpeg.cmake instead of relying on pkg-config, since vcpkg does not have pkg-config. Do not use the ffmpeg from vcpkg on appveyor however, because that pushes the build cache generation over the time limit for jobs. Add secur32 and bcrypt to the list of ffmpeg libs on windows, these are standard windows libraries. Change some code in ffmpeg.cpp to remove C-style casts of struct initializers, which are illegal in MSVC. Add the INT64_C and UINT64_C macros missing in MSVC's stdint.h (if not defined) to ffmpeg.h before the ffmpeg headers are included, because they rely on them. Rewrite the wxWidgets finding code for the vcpkg wxWidgets to be nicer and work correctly for debug and static builds. Remove all /W* and /w* warnings options from cmake compiler flags, and replace them with /W4 for debug builds, and /w (no warnings) for release modes. When building a static binary, remove all /MD* flags from cmake compiler flags, and use /MT for static release builds and /MTd for static debug builds. Improve the vcpkg toolchain wrapper to only rebuild the vcpkg binary if there were git updates. Redo the handling of SDL2 and SDL_main. Only link SDL2Main to the SDL binary and don't use the definitions. Update CMakeSettings.json to use Ninja and include static configurations. Use CMAKE_PROJECT_DIR instead of CMAKE_SOURCE_DIR to determine the vcpkg root, as CMAKE_SOURCE_DIR is sometimes set incorrectly in the 2017 GUI. Add /nodefaultlib:libcmt to the debug build link flags, as in debug builds libcmtd is used and libcmt should not be. Add /subsystem:console to debug build link flags to produce a windows console app for debug builds, like we do for mingw builds. To do this, define a WIN32_CONSOLE_APP macro and if set, define a main() that calls WinMain(). Call wxMesdsageOutput::Set() in OnInit with an instance of wxMessageOutputStderr for windows debug builds to make sure the --help text etc. goes to the console instead of a popup box. Update the Visual Studio related text in README.md. Fix dynamic debug builds by linking to the debug version of SDL2 and copying the debug version of the dll to the build dir. Fix issue in MainFrame::BindAppIcon with the function we are using not being found in a Windows DLL in debug builds by using wxDynamicLibrary::GetSymboolAorW() instead of GetSymbol(). Enable LTO for MSVC in Release modes, if the option is set. Change appveyor config to use an 8 item build matrix of x64/x86 / Release/Debug / Static/Dynamic. And test the binary in debug modes by running --help. When copying the wxrc.exe out of the build tree, copy both the release and debug versions, this is so that appveyor caching of vcpkg works, since the build trees are not cached. Add some necessary win32 libraries to the SDL binary. And enable building it on appveyor. Fix #465. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-10 11:13:58 +00:00
find_package(PkgConfig)
cmake: auto-detect sfml, ffmpeg and openal In cmake detect if the dependencies for link (sfml), recording (ffmpeg) and openal are installed and default the features to `ON` if they are, otherwise to `OFF`. This simplifies the cmake usage. Update the default column in the `README.md` table to `AUTO` as well. Remove the cmake options from `installdeps` instructions, since they are auto-detected. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-08-20 08:21:38 +00:00
set(ENABLE_LINK_DEFAULT OFF)
# msys2 does not have static sfml libs atm
# while on mxe we use static libs
if(WIN32 AND ((NOT (MINGW AND MSYS)) OR CMAKE_TOOLCHAIN_FILE MATCHES mxe) AND NOT CMAKE_TOOLCHAIN_FILE MATCHES vcpkg)
Fix compilation issue when `ENABLE_DEBUGGER=Off`. We protect all code relevant to disabling this property with either `BKPT_SUPPORT` or `NO_DEBUGGER`. This is mostly debugging options or prints scattered around the code. We also adjust cmake to ignore the specific files surround it, but allowing the rest of the GUI to work. - Fix #431.
2019-05-30 11:50:45 +00:00
set(SFML_STATIC_LIBRARIES TRUE)
cmake: auto-detect sfml, ffmpeg and openal In cmake detect if the dependencies for link (sfml), recording (ffmpeg) and openal are installed and default the features to `ON` if they are, otherwise to `OFF`. This simplifies the cmake usage. Update the default column in the `README.md` table to `AUTO` as well. Remove the cmake options from `installdeps` instructions, since they are auto-detected. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-08-20 08:21:38 +00:00
endif()
Allow binding specific server IP. (#633) For the netlink dialog, leave the server IP text field enabled when the server radio button is selected and bind it to the new option gopts.server_ip which defaults to "*" for binding on all addresses, which was the previous behavior. Copy this value to the new GBALink global IP_LINK_BIND_ADDRESS and use it when creating a listening socket. SFML supports creating sf:IpAddress values from hostnames, consequently no additional code is needed to support hostnames in the netlink dialog. Change GetLinkServerHost to return the primary local address when the value is "*", which was the previous behavior, and the set value otherwise. Remove the min/max macros from GBALink as they are unnecessary and conflict with std headers. Require at least SFML 2.4 instead of 2.x for the IP binding functionality in cmake. - Fix #632 Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2020-03-16 16:37:01 +00:00
find_package(SFML 2.4 COMPONENTS network system)
cmake: auto-detect sfml, ffmpeg and openal In cmake detect if the dependencies for link (sfml), recording (ffmpeg) and openal are installed and default the features to `ON` if they are, otherwise to `OFF`. This simplifies the cmake usage. Update the default column in the `README.md` table to `AUTO` as well. Remove the cmake options from `installdeps` instructions, since they are auto-detected. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-08-20 08:21:38 +00:00
if(SFML_FOUND)
Fix compilation issue when `ENABLE_DEBUGGER=Off`. We protect all code relevant to disabling this property with either `BKPT_SUPPORT` or `NO_DEBUGGER`. This is mostly debugging options or prints scattered around the code. We also adjust cmake to ignore the specific files surround it, but allowing the rest of the GUI to work. - Fix #431.
2019-05-30 11:50:45 +00:00
set(ENABLE_LINK_DEFAULT ON)
cmake: auto-detect sfml, ffmpeg and openal In cmake detect if the dependencies for link (sfml), recording (ffmpeg) and openal are installed and default the features to `ON` if they are, otherwise to `OFF`. This simplifies the cmake usage. Update the default column in the `README.md` table to `AUTO` as well. Remove the cmake options from `installdeps` instructions, since they are auto-detected. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-08-20 08:21:38 +00:00
endif()
option(ENABLE_LINK "Enable GBA linking functionality" ${ENABLE_LINK_DEFAULT})
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
option(ENABLE_LIRC "Enable LIRC support" OFF)
msys2 build improvements * Enable ffmpeg by default only on linux and msys2, it will be disabled for normal windows builds and on mac. * Set SFML_STATIC_LIBRARIES only for normal non-msys2 windows builds, because msys2 does not currently have static versions of the SFML sub-libraries, e.g. system, network, etc.. Dynamic linking works fine for now. * Fix quoting for -DLOCALEDIR, on windows spaces were causing errors in make on msys2. * Update to upstream FindSFML.cmake . * Add an ./installdeps-msys2 script to install all necessary tools and libraries on msys2 for building both 64 and 32 bit windows Wx binaries. * Add the dependencies/mingw-xaudio/include directory to INCLUDE_DIRECTORIES so that XAudio compiles on msys2, as mingw-w64 does not currently have XAudio headers. Also check that the user pulled the git submodule in the process (the ./installdeps-msys2 script does this for you.) TODO: * Generalize ./installdeps to work on more platforms. * Make console Wx app in debug mode so that debug prints will work. * Fix game keyboard input for msys2 builds. * Add HiDPI support for Windows. * Fix the -D*DIR defines to have the correct paths on windows.
2016-11-14 18:56:50 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
set(FFMPEG_DEFAULT OFF)
msys2 build improvements * Enable ffmpeg by default only on linux and msys2, it will be disabled for normal windows builds and on mac. * Set SFML_STATIC_LIBRARIES only for normal non-msys2 windows builds, because msys2 does not currently have static versions of the SFML sub-libraries, e.g. system, network, etc.. Dynamic linking works fine for now. * Fix quoting for -DLOCALEDIR, on windows spaces were causing errors in make on msys2. * Update to upstream FindSFML.cmake . * Add an ./installdeps-msys2 script to install all necessary tools and libraries on msys2 for building both 64 and 32 bit windows Wx binaries. * Add the dependencies/mingw-xaudio/include directory to INCLUDE_DIRECTORIES so that XAudio compiles on msys2, as mingw-w64 does not currently have XAudio headers. Also check that the user pulled the git submodule in the process (the ./installdeps-msys2 script does this for you.) TODO: * Generalize ./installdeps to work on more platforms. * Make console Wx app in debug mode so that debug prints will work. * Fix game keyboard input for msys2 builds. * Add HiDPI support for Windows. * Fix the -D*DIR defines to have the correct paths on windows.
2016-11-14 18:56:50 +00:00
cmake: Visual Studio support improvements. Add support for vcpkg ffmpeg, this requires using someone's FindFFmpeg.cmake instead of relying on pkg-config, since vcpkg does not have pkg-config. Do not use the ffmpeg from vcpkg on appveyor however, because that pushes the build cache generation over the time limit for jobs. Add secur32 and bcrypt to the list of ffmpeg libs on windows, these are standard windows libraries. Change some code in ffmpeg.cpp to remove C-style casts of struct initializers, which are illegal in MSVC. Add the INT64_C and UINT64_C macros missing in MSVC's stdint.h (if not defined) to ffmpeg.h before the ffmpeg headers are included, because they rely on them. Rewrite the wxWidgets finding code for the vcpkg wxWidgets to be nicer and work correctly for debug and static builds. Remove all /W* and /w* warnings options from cmake compiler flags, and replace them with /W4 for debug builds, and /w (no warnings) for release modes. When building a static binary, remove all /MD* flags from cmake compiler flags, and use /MT for static release builds and /MTd for static debug builds. Improve the vcpkg toolchain wrapper to only rebuild the vcpkg binary if there were git updates. Redo the handling of SDL2 and SDL_main. Only link SDL2Main to the SDL binary and don't use the definitions. Update CMakeSettings.json to use Ninja and include static configurations. Use CMAKE_PROJECT_DIR instead of CMAKE_SOURCE_DIR to determine the vcpkg root, as CMAKE_SOURCE_DIR is sometimes set incorrectly in the 2017 GUI. Add /nodefaultlib:libcmt to the debug build link flags, as in debug builds libcmtd is used and libcmt should not be. Add /subsystem:console to debug build link flags to produce a windows console app for debug builds, like we do for mingw builds. To do this, define a WIN32_CONSOLE_APP macro and if set, define a main() that calls WinMain(). Call wxMesdsageOutput::Set() in OnInit with an instance of wxMessageOutputStderr for windows debug builds to make sure the --help text etc. goes to the console instead of a popup box. Update the Visual Studio related text in README.md. Fix dynamic debug builds by linking to the debug version of SDL2 and copying the debug version of the dll to the build dir. Fix issue in MainFrame::BindAppIcon with the function we are using not being found in a Windows DLL in debug builds by using wxDynamicLibrary::GetSymboolAorW() instead of GetSymbol(). Enable LTO for MSVC in Release modes, if the option is set. Change appveyor config to use an 8 item build matrix of x64/x86 / Release/Debug / Static/Dynamic. And test the binary in debug modes by running --help. When copying the wxrc.exe out of the build tree, copy both the release and debug versions, this is so that appveyor caching of vcpkg works, since the build trees are not cached. Add some necessary win32 libraries to the SDL binary. And enable building it on appveyor. Fix #465. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-10 11:13:58 +00:00
set(FFMPEG_COMPONENTS AVCODEC AVFORMAT SWSCALE AVUTIL SWRESAMPLE)
set(FFMPEG_COMPONENT_VERSIONS AVCODEC>=58.18.100 AVFORMAT>=58.12.100 SWSCALE>=5.1.100 AVUTIL>=56.14.100 SWRESAMPLE>=3.1.100)
cmake: auto-detect sfml, ffmpeg and openal In cmake detect if the dependencies for link (sfml), recording (ffmpeg) and openal are installed and default the features to `ON` if they are, otherwise to `OFF`. This simplifies the cmake usage. Update the default column in the `README.md` table to `AUTO` as well. Remove the cmake options from `installdeps` instructions, since they are auto-detected. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-08-20 08:21:38 +00:00
cmake: Visual Studio support improvements. Add support for vcpkg ffmpeg, this requires using someone's FindFFmpeg.cmake instead of relying on pkg-config, since vcpkg does not have pkg-config. Do not use the ffmpeg from vcpkg on appveyor however, because that pushes the build cache generation over the time limit for jobs. Add secur32 and bcrypt to the list of ffmpeg libs on windows, these are standard windows libraries. Change some code in ffmpeg.cpp to remove C-style casts of struct initializers, which are illegal in MSVC. Add the INT64_C and UINT64_C macros missing in MSVC's stdint.h (if not defined) to ffmpeg.h before the ffmpeg headers are included, because they rely on them. Rewrite the wxWidgets finding code for the vcpkg wxWidgets to be nicer and work correctly for debug and static builds. Remove all /W* and /w* warnings options from cmake compiler flags, and replace them with /W4 for debug builds, and /w (no warnings) for release modes. When building a static binary, remove all /MD* flags from cmake compiler flags, and use /MT for static release builds and /MTd for static debug builds. Improve the vcpkg toolchain wrapper to only rebuild the vcpkg binary if there were git updates. Redo the handling of SDL2 and SDL_main. Only link SDL2Main to the SDL binary and don't use the definitions. Update CMakeSettings.json to use Ninja and include static configurations. Use CMAKE_PROJECT_DIR instead of CMAKE_SOURCE_DIR to determine the vcpkg root, as CMAKE_SOURCE_DIR is sometimes set incorrectly in the 2017 GUI. Add /nodefaultlib:libcmt to the debug build link flags, as in debug builds libcmtd is used and libcmt should not be. Add /subsystem:console to debug build link flags to produce a windows console app for debug builds, like we do for mingw builds. To do this, define a WIN32_CONSOLE_APP macro and if set, define a main() that calls WinMain(). Call wxMesdsageOutput::Set() in OnInit with an instance of wxMessageOutputStderr for windows debug builds to make sure the --help text etc. goes to the console instead of a popup box. Update the Visual Studio related text in README.md. Fix dynamic debug builds by linking to the debug version of SDL2 and copying the debug version of the dll to the build dir. Fix issue in MainFrame::BindAppIcon with the function we are using not being found in a Windows DLL in debug builds by using wxDynamicLibrary::GetSymboolAorW() instead of GetSymbol(). Enable LTO for MSVC in Release modes, if the option is set. Change appveyor config to use an 8 item build matrix of x64/x86 / Release/Debug / Static/Dynamic. And test the binary in debug modes by running --help. When copying the wxrc.exe out of the build tree, copy both the release and debug versions, this is so that appveyor caching of vcpkg works, since the build trees are not cached. Add some necessary win32 libraries to the SDL binary. And enable building it on appveyor. Fix #465. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-10 11:13:58 +00:00
macro(check_ffmpeg_component_versions)
# check versions, but only if pkgconfig is available
if(FFMPEG_FOUND AND PKG_CONFIG_FOUND AND NOT CMAKE_TOOLCHAIN_FILE MATCHES vcpkg)
foreach(component ${FFMPEG_COMPONENT_VERSIONS})
string(REPLACE ">=" ";" parts ${component})
list(GET parts 0 name)
list(GET parts 1 version)
cmake: check for ffmpeg >= 4.0.4 Check for the specific `ffmpeg` lib versions in `ffmpeg` `4.0.4` "Wu", Do not pass `-DENABLE_FFMPEG=OFF` to the xenial travis job, as this is detected automatically now. Add a note about the required ffmpeg version to `README.md`. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-09-01 20:37:39 +00:00
cmake: Visual Studio support improvements. Add support for vcpkg ffmpeg, this requires using someone's FindFFmpeg.cmake instead of relying on pkg-config, since vcpkg does not have pkg-config. Do not use the ffmpeg from vcpkg on appveyor however, because that pushes the build cache generation over the time limit for jobs. Add secur32 and bcrypt to the list of ffmpeg libs on windows, these are standard windows libraries. Change some code in ffmpeg.cpp to remove C-style casts of struct initializers, which are illegal in MSVC. Add the INT64_C and UINT64_C macros missing in MSVC's stdint.h (if not defined) to ffmpeg.h before the ffmpeg headers are included, because they rely on them. Rewrite the wxWidgets finding code for the vcpkg wxWidgets to be nicer and work correctly for debug and static builds. Remove all /W* and /w* warnings options from cmake compiler flags, and replace them with /W4 for debug builds, and /w (no warnings) for release modes. When building a static binary, remove all /MD* flags from cmake compiler flags, and use /MT for static release builds and /MTd for static debug builds. Improve the vcpkg toolchain wrapper to only rebuild the vcpkg binary if there were git updates. Redo the handling of SDL2 and SDL_main. Only link SDL2Main to the SDL binary and don't use the definitions. Update CMakeSettings.json to use Ninja and include static configurations. Use CMAKE_PROJECT_DIR instead of CMAKE_SOURCE_DIR to determine the vcpkg root, as CMAKE_SOURCE_DIR is sometimes set incorrectly in the 2017 GUI. Add /nodefaultlib:libcmt to the debug build link flags, as in debug builds libcmtd is used and libcmt should not be. Add /subsystem:console to debug build link flags to produce a windows console app for debug builds, like we do for mingw builds. To do this, define a WIN32_CONSOLE_APP macro and if set, define a main() that calls WinMain(). Call wxMesdsageOutput::Set() in OnInit with an instance of wxMessageOutputStderr for windows debug builds to make sure the --help text etc. goes to the console instead of a popup box. Update the Visual Studio related text in README.md. Fix dynamic debug builds by linking to the debug version of SDL2 and copying the debug version of the dll to the build dir. Fix issue in MainFrame::BindAppIcon with the function we are using not being found in a Windows DLL in debug builds by using wxDynamicLibrary::GetSymboolAorW() instead of GetSymbol(). Enable LTO for MSVC in Release modes, if the option is set. Change appveyor config to use an 8 item build matrix of x64/x86 / Release/Debug / Static/Dynamic. And test the binary in debug modes by running --help. When copying the wxrc.exe out of the build tree, copy both the release and debug versions, this is so that appveyor caching of vcpkg works, since the build trees are not cached. Add some necessary win32 libraries to the SDL binary. And enable building it on appveyor. Fix #465. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-10 11:13:58 +00:00
if((NOT DEFINED ${name}_VERSION) OR ${name}_VERSION VERSION_LESS ${version})
set(FFMPEG_FOUND OFF)
endif()
endforeach()
endif()
endmacro()
cmake: auto-detect sfml, ffmpeg and openal In cmake detect if the dependencies for link (sfml), recording (ffmpeg) and openal are installed and default the features to `ON` if they are, otherwise to `OFF`. This simplifies the cmake usage. Update the default column in the `README.md` table to `AUTO` as well. Remove the cmake options from `installdeps` instructions, since they are auto-detected. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-08-20 08:21:38 +00:00
cmake: No default ffmpeg on 32 bit Windows. Only check for ffmpeg if it's not explicitly turned off and the target is not 32 bit Windows. This is done because Windows XP does not have bcrypt.dll which ffmpeg requires and the 32 bit builds are more likely to be used on older systems which would also benefit from the smaller binary size. Also add the X86 and X64 cmake architecture variable flags. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-18 14:17:20 +00:00
if(((NOT DEFINED ENABLE_FFMPEG) AND (NOT (WIN32 AND X86))) OR ENABLE_FFMPEG)
set(FFMPEG_DEFAULT ON)
cmake: check for ffmpeg >= 4.0.4 Check for the specific `ffmpeg` lib versions in `ffmpeg` `4.0.4` "Wu", Do not pass `-DENABLE_FFMPEG=OFF` to the xenial travis job, as this is detected automatically now. Add a note about the required ffmpeg version to `README.md`. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-09-01 20:37:39 +00:00
cmake: No default ffmpeg on 32 bit Windows. Only check for ffmpeg if it's not explicitly turned off and the target is not 32 bit Windows. This is done because Windows XP does not have bcrypt.dll which ffmpeg requires and the 32 bit builds are more likely to be used on older systems which would also benefit from the smaller binary size. Also add the X86 and X64 cmake architecture variable flags. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-18 14:17:20 +00:00
find_package(FFmpeg COMPONENTS ${FFMPEG_COMPONENTS})
check_ffmpeg_component_versions()
cmake: auto-detect sfml, ffmpeg and openal In cmake detect if the dependencies for link (sfml), recording (ffmpeg) and openal are installed and default the features to `ON` if they are, otherwise to `OFF`. This simplifies the cmake usage. Update the default column in the `README.md` table to `AUTO` as well. Remove the cmake options from `installdeps` instructions, since they are auto-detected. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-08-20 08:21:38 +00:00
cmake: No default ffmpeg on 32 bit Windows. Only check for ffmpeg if it's not explicitly turned off and the target is not 32 bit Windows. This is done because Windows XP does not have bcrypt.dll which ffmpeg requires and the 32 bit builds are more likely to be used on older systems which would also benefit from the smaller binary size. Also add the X86 and X64 cmake architecture variable flags. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-18 14:17:20 +00:00
if(NOT FFMPEG_FOUND)
set(FFMPEG_DEFAULT OFF)
endif()
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
endif()
msys2 build improvements * Enable ffmpeg by default only on linux and msys2, it will be disabled for normal windows builds and on mac. * Set SFML_STATIC_LIBRARIES only for normal non-msys2 windows builds, because msys2 does not currently have static versions of the SFML sub-libraries, e.g. system, network, etc.. Dynamic linking works fine for now. * Fix quoting for -DLOCALEDIR, on windows spaces were causing errors in make on msys2. * Update to upstream FindSFML.cmake . * Add an ./installdeps-msys2 script to install all necessary tools and libraries on msys2 for building both 64 and 32 bit windows Wx binaries. * Add the dependencies/mingw-xaudio/include directory to INCLUDE_DIRECTORIES so that XAudio compiles on msys2, as mingw-w64 does not currently have XAudio headers. Also check that the user pulled the git submodule in the process (the ./installdeps-msys2 script does this for you.) TODO: * Generalize ./installdeps to work on more platforms. * Make console Wx app in debug mode so that debug prints will work. * Fix game keyboard input for msys2 builds. * Add HiDPI support for Windows. * Fix the -D*DIR defines to have the correct paths on windows.
2016-11-14 18:56:50 +00:00
option(ENABLE_FFMPEG "Enable ffmpeg A/V recording" ${FFMPEG_DEFAULT})
WinSparkle wrapper improvements. - Make WinSparkleDllWrapper a real singleton. Make the constructor private and add a static `GetInstance()` method that constructs the single instance and/or returns it. Make it encapsulate the function pointers and the wxDynamicLibrary instance, with the API as friend functions. - Make winsparkle API completely self-contained. Make the instance of the WinSparkleDllWrapper a factory function local static. This way the calling program does not have to manage the life-cycle, the singleton is initialized when the API is first invoked, and destroyed during global destruction. The destructor is now also private, because the singleton object is destroyed during global destruction. Found the solution here: https://stackoverflow.com/a/46139631/262458 - Cmake improvements. Only enable the ENABLE_ONLINEUPDATES option by default if we are going to use winsparkle on 32 or 64 bit intel windows. Do not inlclude winsparkle if the option is off. - Disable for now. Currently ENABLE_ONLINEUPDATES defaults to OFF even on intel/windows, until we do more work on this feature. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-11-09 23:44:23 +00:00
set(ONLINEUPDATES_DEFAULT OFF)
[Windows,MacOS] Auto-updater refactoring. (#639) Create and enable auto-updater for MacOS using `Sparkle=1.23`. We need to sign our app using an `Apple Developer Key` for it to work properly, since we are not going to sign updates with the Sparkle key. Add all auto-updater files to `gettext`'s pot. Use `str_split` to always get related stable version. We do not want to check for nightly builds. For Windows, we create the flag `-DHTTPS` to select between using an HTTPS or HTTP URL for the auto-updater checks. We use this to keep support for Windows XP (HTTP only) while all others should be HTTPS. Also, use `::FreeLibrary` to allow us to remove the temporary file that stores the `WinSparkle.dll`. Previously, we could not get it to work with `wine`.
2020-05-08 02:06:00 +00:00
if((WIN32 AND (X64 OR X86)) OR APPLE) # winsparkle/sparkle
set(ONLINEUPDATES_DEFAULT ON)
WinSparkle wrapper improvements. - Make WinSparkleDllWrapper a real singleton. Make the constructor private and add a static `GetInstance()` method that constructs the single instance and/or returns it. Make it encapsulate the function pointers and the wxDynamicLibrary instance, with the API as friend functions. - Make winsparkle API completely self-contained. Make the instance of the WinSparkleDllWrapper a factory function local static. This way the calling program does not have to manage the life-cycle, the singleton is initialized when the API is first invoked, and destroyed during global destruction. The destructor is now also private, because the singleton object is destroyed during global destruction. Found the solution here: https://stackoverflow.com/a/46139631/262458 - Cmake improvements. Only enable the ENABLE_ONLINEUPDATES option by default if we are going to use winsparkle on 32 or 64 bit intel windows. Do not inlclude winsparkle if the option is off. - Disable for now. Currently ENABLE_ONLINEUPDATES defaults to OFF even on intel/windows, until we do more work on this feature. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-11-09 23:44:23 +00:00
endif()
option(ENABLE_ONLINEUPDATES "Enable online update checks" ${ONLINEUPDATES_DEFAULT})
[Windows,MacOS] Auto-updater refactoring. (#639) Create and enable auto-updater for MacOS using `Sparkle=1.23`. We need to sign our app using an `Apple Developer Key` for it to work properly, since we are not going to sign updates with the Sparkle key. Add all auto-updater files to `gettext`'s pot. Use `str_split` to always get related stable version. We do not want to check for nightly builds. For Windows, we create the flag `-DHTTPS` to select between using an HTTPS or HTTP URL for the auto-updater checks. We use this to keep support for Windows XP (HTTP only) while all others should be HTTPS. Also, use `::FreeLibrary` to allow us to remove the temporary file that stores the `WinSparkle.dll`. Previously, we could not get it to work with `wine`.
2020-05-08 02:06:00 +00:00
option(HTTPS "Use https URL for winsparkle" ON)
if(NOT HTTPS)
add_definitions(-DNO_HTTPS)
endif()
[LINUX] Add option to disable the online updater. Add option to remove all configuration related to checking for updates online. Although it is not implemented at the moment, these options appeared on our menu `Options` > `General ...`. - Fix need of patch on #140.
2019-07-10 23:47:16 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
set(LTO_DEFAULT ON)
work around gcc lto wrappers bug with gcc 7.x gcc lto wrapper commands such as `gcc-ar` will segfault with some versions of gcc 7.x when called via an absolute path, see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80717 Generalize the mechanism for compiling a small C program on the host (currently used for bin2c for Wx resources) and use it to wrap the gcc wrappers in a little executable that prepends their dirname to PATH and runs them with `execvp()`. Make LTO default to ON again, except on win32 with gcc < 7, because those toolchains produce broken binaries with LTO enabled. Also add `-ffat-lto-objects` to compiler flags for gcc when LTO is enabled, this will increase the chances that the LTO build will succeed even if there are issues with the binutils wrappers. Clang does not support this.
2017-09-17 02:47:39 +00:00
cmake: Visual Studio support improvements. Add support for vcpkg ffmpeg, this requires using someone's FindFFmpeg.cmake instead of relying on pkg-config, since vcpkg does not have pkg-config. Do not use the ffmpeg from vcpkg on appveyor however, because that pushes the build cache generation over the time limit for jobs. Add secur32 and bcrypt to the list of ffmpeg libs on windows, these are standard windows libraries. Change some code in ffmpeg.cpp to remove C-style casts of struct initializers, which are illegal in MSVC. Add the INT64_C and UINT64_C macros missing in MSVC's stdint.h (if not defined) to ffmpeg.h before the ffmpeg headers are included, because they rely on them. Rewrite the wxWidgets finding code for the vcpkg wxWidgets to be nicer and work correctly for debug and static builds. Remove all /W* and /w* warnings options from cmake compiler flags, and replace them with /W4 for debug builds, and /w (no warnings) for release modes. When building a static binary, remove all /MD* flags from cmake compiler flags, and use /MT for static release builds and /MTd for static debug builds. Improve the vcpkg toolchain wrapper to only rebuild the vcpkg binary if there were git updates. Redo the handling of SDL2 and SDL_main. Only link SDL2Main to the SDL binary and don't use the definitions. Update CMakeSettings.json to use Ninja and include static configurations. Use CMAKE_PROJECT_DIR instead of CMAKE_SOURCE_DIR to determine the vcpkg root, as CMAKE_SOURCE_DIR is sometimes set incorrectly in the 2017 GUI. Add /nodefaultlib:libcmt to the debug build link flags, as in debug builds libcmtd is used and libcmt should not be. Add /subsystem:console to debug build link flags to produce a windows console app for debug builds, like we do for mingw builds. To do this, define a WIN32_CONSOLE_APP macro and if set, define a main() that calls WinMain(). Call wxMesdsageOutput::Set() in OnInit with an instance of wxMessageOutputStderr for windows debug builds to make sure the --help text etc. goes to the console instead of a popup box. Update the Visual Studio related text in README.md. Fix dynamic debug builds by linking to the debug version of SDL2 and copying the debug version of the dll to the build dir. Fix issue in MainFrame::BindAppIcon with the function we are using not being found in a Windows DLL in debug builds by using wxDynamicLibrary::GetSymboolAorW() instead of GetSymbol(). Enable LTO for MSVC in Release modes, if the option is set. Change appveyor config to use an 8 item build matrix of x64/x86 / Release/Debug / Static/Dynamic. And test the binary in debug modes by running --help. When copying the wxrc.exe out of the build tree, copy both the release and debug versions, this is so that appveyor caching of vcpkg works, since the build trees are not cached. Add some necessary win32 libraries to the SDL binary. And enable building it on appveyor. Fix #465. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-10 11:13:58 +00:00
# gcc lto produces buggy binaries for 64 bit mingw
wx 2.8 compat fixes, centos support, cmake fixes Add support for RHEL/centos to installdeps. There is no SFML package. Add some string compatibility stuff so that everything builds on wx 2.8 unicode builds. TODO: add travis slaves for 2.8, with and without unicode Disable the game frame spacer code on 2.8 because it does not work (the frame does not expand.) cmake improvements: - set ENABLE_LTO=OFF for Debug builds by default - set ENABLE_LINK=OFF if SFML cannot be found and continue - use better logic for finding wx utilities wx-config and wxrc Signed-off-by: Rafael Kitover <rkitover@gmail.com> Closes #395 Closes #297
2019-03-28 21:45:06 +00:00
# and we generally don't want it when debugging because it makes linking slow
cmake: Fix fedora mingw build + misc improvements. Use the 3.x wxwidgets mingw package in installdeps. Add the win64 alias to installdeps for 64 bit mingw builds, like the win32 alias for 32 bit mingw builds. Check CROSS_ARCH in Architecture.cmake, set by our mingw toolchains. Disable LTO by default for all mingw builds, not just amd64, because it is unfortunately broken on i686 as well now. Search for heuristically the most appropriate wx-config and set wxWidgets_CONFIG_EXECUTABLE accordingly in the mingw toolchains. Refactor the mingw toolchains somewhat, put common code into a common file, add static toolchains. For static toolchains, also search for a static zlib and set ZLIB_ROOT. Change installdeps instructions to use ninja instead of make. Add ninja to all target dependencies where it was missing, this may be incorrect in a couple of the rarely used targets, if this is the case the affected users are free to open an issue. Also start using ninja on travis instead of make, except for libretro which uses a GNU Makefile. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2020-02-01 16:43:08 +00:00
if(CMAKE_BUILD_TYPE MATCHES Debug OR (WIN32 AND CMAKE_COMPILER_IS_GNUCXX))
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
set(LTO_DEFAULT OFF)
endif()
add LTO option, disable on GCC+AMD64+Win32 Add ENABLE_LTO cmake option that defaults to ON except on GCC building for AMD64 on Win32. Also set the cmake variables AMD64 or X86_32 when one of these architectures is detected.
2016-11-27 23:37:24 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
option(ENABLE_LTO "Compile with Link Time Optimization (gcc and clang only)" ${LTO_DEFAULT})
add LTO option, disable on GCC+AMD64+Win32 Add ENABLE_LTO cmake option that defaults to ON except on GCC building for AMD64 on Win32. Also set the cmake variables AMD64 or X86_32 when one of these architectures is detected.
2016-11-27 23:37:24 +00:00
update Visual Studio support Replace the vcpkg code with a newer and better version. In this version the `vcpkg` directory is on the same level as the source directory, so that IntelliSense does not get confused scanning for files. The cmake variable `VCPKG_TARGET_TRIPLET` is required to activate vcpkg support, it must be set to e.g. `x64-windows` or `x86-windows`. Update `CMakeSettings.json` for the new code for the GUI. Fix a problem copying the `SDL2.dll` file to the binary directory. Update `README.md` with commandline instructions. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-07-03 23:28:48 +00:00
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()
Some fixes for MSVC.
2017-02-11 02:57:35 +00:00
if(MSVC)
update Visual Studio support Replace the vcpkg code with a newer and better version. In this version the `vcpkg` directory is on the same level as the source directory, so that IntelliSense does not get confused scanning for files. The cmake variable `VCPKG_TARGET_TRIPLET` is required to activate vcpkg support, it must be set to e.g. `x64-windows` or `x86-windows`. Update `CMakeSettings.json` for the new code for the GUI. Fix a problem copying the `SDL2.dll` file to the binary directory. Update `README.md` with commandline instructions. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-07-03 23:28:48 +00:00
include_directories("${CMAKE_SOURCE_DIR}/dependencies/msvc")
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
endif()
Some fixes for MSVC.
2017-02-11 02:57:35 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
option(ENABLE_GBA_LOGGING "Enable extended GBA logging" ON)
if(ENABLE_GBA_LOGGING)
cmake: refactor, better clang support Do some reformatting towards the more modern cmake style. Clean up some code. Support linking to gcc compiled wxWidgets by setting `-D__GXX_ABI_VERSION=` appropriately for clang. Use the new method of calling `FindwxWidgets.cmake`, the old method causes some problems now. Set all necessary policies in both cmake files. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-27 03:25:43 +00:00
add_definitions(-DGBA_LOGGING )
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
endif()
buncha patches by darktjm sdl fix not applied yet
2011-05-24 07:39:29 +00:00
if(ENABLE_MMX)
cmake: refactor, better clang support Do some reformatting towards the more modern cmake style. Clean up some code. Support linking to gcc compiled wxWidgets by setting `-D__GXX_ABI_VERSION=` appropriately for clang. Use the new method of calling `FindwxWidgets.cmake`, the old method causes some problems now. Set all necessary policies in both cmake files. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-27 03:25:43 +00:00
add_definitions(-DMMX)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
endif()
CMAKE: Clarify CMakeLists.txt a bit
2011-02-24 11:14:59 +00:00
# The SDL port can't be built without debugging support
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(NOT ENABLE_DEBUGGER AND ENABLE_SDL)
cmake: refactor, better clang support Do some reformatting towards the more modern cmake style. Clean up some code. Support linking to gcc compiled wxWidgets by setting `-D__GXX_ABI_VERSION=` appropriately for clang. Use the new method of calling `FindwxWidgets.cmake`, the old method causes some problems now. Set all necessary policies in both cmake files. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-27 03:25:43 +00:00
message(SEND_ERROR "The SDL port can't be built without debugging support")
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
endif()
Fixing file.
2008-06-06 10:17:20 +00:00
auto deps for visual studio, take 1 Use vcpkg to build deps when Visual Studio on Windows is detected, this only happens on first build, but does take a while because things like wxWidgets need to be built. Building from the developer command line is also supported. I considered making a pre-built tarball available, but the resulting files are just too big for this to be practical. Make the necessary cmake code changes for this to work and to use the vcpkg packages, which work just like on linux or have other cmake glue code available. To do this, we make vcpkg a submodule, use git to checkout all submodules, then just build and use the `vcpkg.exe`. Then we set the CMAKE_TOOLCHAIN_FILE to the vcpkg toolchain and also include it directly, why this is necessary I don't know, without it it doesn't work in the IDE but does on the command line. All of this requires no vcpkg integration with either the user or the project. A user-wide `ENV{VCPKG_ROOT}` is also supported. Fix the dynamic arrays in the GBA core, MSVC follows the C++ standard on this and gcc does not. TODO: add the necessary gcc flags to make this an error in cmake. Use `wxArrayString` instead of `std::vector<wxString>` in `src/wx/strutils.cpp` which is used in options parsing. This was necessary because of a bizarre linker error with wxWidgets when using Visual Studio: https://trac.wxwidgets.org/ticket/10884#comment:46 In `src/wx/panel.cpp` make sure the unimplemented D3D renderer code does not get compiled if it's actually `OFF`. Also fix the new spacer code for the drawing panel to not combine `wxEXPAND` with `wxALIGN_CENTER`, which is an error on wxWidgets 3.1.2, which is what vcpkg uses. The drawing panel seems to be automatically stretched to the max size automatically anyway. TODO: if all of this works, we'll need an Appveyor set up for visual studio. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-21 23:01:46 +00:00
# this has to run after the toolchain is initialized so it can't be in
# Win32deps.cmake
if(MINGW)
include_directories("${CMAKE_SOURCE_DIR}/dependencies/mingw-include")
include_directories("${CMAKE_SOURCE_DIR}/dependencies/mingw-xaudio/include")
endif()
fix rebuilds on git changes Use cmake to generate the version.h from version.h.in which is a cleaned up version of the old version.h with the git short sha into the build directory, and include the version.h from there. Continue to use the GetGitRevisionDescription plugin to make the cmake configuration state depend on the current sha of HEAD, but throw away the results (for the time being.) This makes rebuilds after git changes such as a commit only recompile a couple of files instead of the whole tree.
2017-08-27 20:15:29 +00:00
find_package(Git)
if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
read version and subversion info from Git To get the version, find the last tag in git tag of the form "v2.0.0" or "2.0.0". If this is the last tag and the current commit matches the ref of this tag, the revision will be empty. In the case that the current commit is not tagged with a version, to get the revision, use the short sha unless the current commit is tagged with something that is not a version string, e.g. "feature-foo", in which case the revision will be "feature-foo". If the current commit is tagged as e.g. "v2.0.1-foo" or "2.0.1-foo" then the version will be "2.0.1" and the revision will be "foo". Tags of this form are also checked when finding the current version. This is all done in cmake. If there is no git detected, the version will be "2.0.0" and the revision will be "unknown".
2017-10-07 21:00:47 +00:00
include(GitTagVersion)
git_version(VERSION REVISION VERSION_RELEASE)
fix rebuilds on git changes Use cmake to generate the version.h from version.h.in which is a cleaned up version of the old version.h with the git short sha into the build directory, and include the version.h from there. Continue to use the GetGitRevisionDescription plugin to make the cmake configuration state depend on the current sha of HEAD, but throw away the results (for the time being.) This makes rebuilds after git changes such as a commit only recompile a couple of files instead of the whole tree.
2017-08-27 20:15:29 +00:00
# only use the plugin to tie the configure state to the sha to force rebuilds
# of files that depend on version.h
include(GetGitRevisionDescription)
get_git_head_revision(REFSPEC COMMITHASH)
cmake: Replace old git tags if found. Detect old badly formatted git tags we used in the user's git clone, and if found delete all tags and fetch them from the origin. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2020-03-05 15:04:19 +00:00
# Make sure old tags are gone from all clones.
execute_process(
COMMAND ${GIT_EXECUTABLE} tag -l
OUTPUT_VARIABLE git_tags
OUTPUT_STRIP_TRAILING_WHITESPACE
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
)
string(REGEX REPLACE ";" "\\\\;" git_tags_lines "${git_tags}")
string(REGEX REPLACE "\r?\n" ";" git_tags_lines "${git_tags_lines}")
set(found_old_tags FALSE)
foreach(tag ${git_tags_lines})
if(NOT tag MATCHES "^v[0-9]")
set(found_old_tags TRUE)
break()
endif()
endforeach()
if(found_old_tags)
# Delete all tags and fetch them from the origin.
foreach(tag ${git_tags_lines})
execute_process(
COMMAND ${GIT_EXECUTABLE} tag -d ${tag}
OUTPUT_QUIET
ERROR_QUIET
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
)
endforeach()
execute_process(
cmake: When replacing old tags, use origin. Fetch new set of tags from the origin remote explicitly rather than whatever remote is associated with the current branch. In this way, old tags on other remotes get overwritten as well. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2020-03-07 11:36:40 +00:00
COMMAND ${GIT_EXECUTABLE} fetch --tags origin
cmake: Replace old git tags if found. Detect old badly formatted git tags we used in the user's git clone, and if found delete all tags and fetch them from the origin. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2020-03-05 15:04:19 +00:00
OUTPUT_QUIET
ERROR_QUIET
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
)
endif()
fix error and version info in shallow git clones Fix `cmake/GitTagVersion.cmake` to not throw errors when in a shallow git clone, or any git clone that has no tags. And when either git or git tag version info is not available, set the version variables to the defaults, which are: ``` VERSION = '2.0.0' REVISION = 'unknown' VERSION_RELEASE = 0 ```
2017-10-08 01:17:52 +00:00
endif()
fix rebuilds on git changes Use cmake to generate the version.h from version.h.in which is a cleaned up version of the old version.h with the git short sha into the build directory, and include the version.h from there. Continue to use the GetGitRevisionDescription plugin to make the cmake configuration state depend on the current sha of HEAD, but throw away the results (for the time being.) This makes rebuilds after git changes such as a commit only recompile a couple of files instead of the whole tree.
2017-08-27 20:15:29 +00:00
read version info from CHANGELOG.md if no git If git tags are not available, set the version and revision by finding the first version tag in `CHANGELOG.md` of the form ``` ``` Where N.N.N is the number version (number of components can vary) and the revision (as speicified by -REV) is optional. TODO: support named revision without a version number of the form `[REV]`.
2017-10-12 02:17:25 +00:00
# no git or no tags, use ChangeLog
fix error and version info in shallow git clones Fix `cmake/GitTagVersion.cmake` to not throw errors when in a shallow git clone, or any git clone that has no tags. And when either git or git tag version info is not available, set the version variables to the defaults, which are: ``` VERSION = '2.0.0' REVISION = 'unknown' VERSION_RELEASE = 0 ```
2017-10-08 01:17:52 +00:00
if(NOT VERSION)
read version info from CHANGELOG.md if no git If git tags are not available, set the version and revision by finding the first version tag in `CHANGELOG.md` of the form ``` ``` Where N.N.N is the number version (number of components can vary) and the revision (as speicified by -REV) is optional. TODO: support named revision without a version number of the form `[REV]`.
2017-10-12 02:17:25 +00:00
include(ChangeLogVersion)
changelog_version(VERSION REVISION VERSION_RELEASE)
fix rebuilds on git changes Use cmake to generate the version.h from version.h.in which is a cleaned up version of the old version.h with the git short sha into the build directory, and include the version.h from there. Continue to use the GetGitRevisionDescription plugin to make the cmake configuration state depend on the current sha of HEAD, but throw away the results (for the time being.) This makes rebuilds after git changes such as a commit only recompile a couple of files instead of the whole tree.
2017-08-27 20:15:29 +00:00
endif()
# generate version.h
include_directories(${CMAKE_BINARY_DIR})
win: set correct version in rc xvbam.rc: use version.h to generate version strings, cmake: adding version in odd format required by rc
2019-10-02 23:32:35 +00:00
string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+).*" "\\1,\\2,\\3,0" WIN_VERSION "${VERSION}")
fix rebuilds on git changes Use cmake to generate the version.h from version.h.in which is a cleaned up version of the old version.h with the git short sha into the build directory, and include the version.h from there. Continue to use the GetGitRevisionDescription plugin to make the cmake configuration state depend on the current sha of HEAD, but throw away the results (for the time being.) This makes rebuilds after git changes such as a commit only recompile a couple of files instead of the whole tree.
2017-08-27 20:15:29 +00:00
configure_file("${CMAKE_SOURCE_DIR}/src/version.h.in" "${CMAKE_BINARY_DIR}/version.h" @ONLY)
Fixing file.
2008-06-06 10:17:20 +00:00
wx 2.8 compat fixes, centos support, cmake fixes Add support for RHEL/centos to installdeps. There is no SFML package. Add some string compatibility stuff so that everything builds on wx 2.8 unicode builds. TODO: add travis slaves for 2.8, with and without unicode Disable the game frame spacer code on 2.8 because it does not work (the frame does not expand.) cmake improvements: - set ENABLE_LTO=OFF for Debug builds by default - set ENABLE_LINK=OFF if SFML cannot be found and continue - use better logic for finding wx utilities wx-config and wxrc Signed-off-by: Rafael Kitover <rkitover@gmail.com> Closes #395 Closes #297
2019-03-28 21:45:06 +00:00
if(CMAKE_BUILD_TYPE MATCHES Debug)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
add_definitions(-DDEBUG)
else()
add_definitions(-DNDEBUG)
endif()
set Zach's CXXFLAGS only on gcc/clang Set the flags Zach gave me only when cmake detects gcc or clang, this way other generators like Visual Studio will still work fine.
2016-11-20 14:15:27 +00:00
support Ninja cmake generator on msys2 Add a hack to the root CMakeLists.txt to SET(MSYS ON) for the Ninja generator when running under msys2, otherwise it cannot find libs. The quoting fixes from #70 allow all of this to work.
2017-02-11 22:18:38 +00:00
# hack for ninja in msys2
cmake: Add some release automation steps. Use ENV{MSYSTEM_PREFIX} instead of ENV{MSYSTEM} to check for msys2 as that is more reliable. Generate the translations.zip when building for Windows from the generated .gmo files. Add the UPSTREAM_RELEASE option to perform some additional release automation steps: - Codesign for Windows with either the Visual Studio signtool or osslsigncode when using MinGW. - On Windows zip up the .exe into the appropriate zip file for release. - Generate the gpg signature .asc files for the translations zip and the .exe zip on Windows. - On Mac codesign the app, zip it and sign the zip. - On all platforms try to strip the binary. Remove the release automation steps from the builder script as they are now in cmake. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-24 06:32:01 +00:00
if(WIN32 AND CMAKE_GENERATOR STREQUAL Ninja AND NOT "$ENV{MSYSTEM_PREFIX}" STREQUAL "")
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
set(MSYS ON)
endif()
support Ninja cmake generator on msys2 Add a hack to the root CMakeLists.txt to SET(MSYS ON) for the Ninja generator when running under msys2, otherwise it cannot find libs. The quoting fixes from #70 allow all of this to work.
2017-02-11 22:18:38 +00:00
Mac OS X HiDPI fixes + other misc Use a high-res surface on HiDPI (e.g. retina) Macs for the OpenGL renderer, and scale window accordingly. Also fix fullscreen toggle not working in HiDPI mode. And some other stuff. Aside from the .app not being linked statically, the app is now fully functional on Mac and ready to ship. Full change details: * add -DDEBUG or -DNDEBUG based on CMAKE_BUILD_TYPE (-DNDEBUG for Release and -DDEBUG for Debug) * properly search for homebrew/macports/fink directories, and only add them if they exist * fix building with wx debug support, when available * use explicit OpenGL context on Mac too for new versions of wx * add main_frame pointer in GameArea back to MainFrame, and a SetMainFrame(MainFrame* parent) public method to set it in guinit * add full support for reading and writing double value config options (the GUI still needs to be updated for options that can take doubles, such as video_scale) * change video_scale option (Display/Scale) to a double, putting a double value such as 3.6 in the config file works correctly * add a HiDPIAware mixin class for GameArea and DrawingPanel, with the method HiDPIScaleFactor which returns the current window's backingScaleFactor * change the GameArea sizing methods (DelBorder(), AdjustMinSize() and AdjustSize()) to divide the window size by the HiDPIAware::HiDPIScaleFactor so that the window is scaled properly * change GameArea::ShowFullScreen to ignore fullscreen events for a maximized window on Mac, because maximized windows on OS X are actually native fullscreen windows * change scale variables to double from int, and use std::ceil() to round scaled pixel or memory size values * make a default base class DrawingPane::DrawingPanelInit() virtual method, call by all concrete class constructors based on the did_init flag * call setWantsBestResolutionOpenGLSurface:YES on the view backing the wxGLCanvas for the OpenGL renderer (GLDrawingPanel) to get a high res OpenGL surface in HiDPI mode * remove GLDrawingPanel::OnSize event, the OpenGL viewport resizes automatically without the need to call glViewport() * do not hide the mouse pointer if the main frame has menus or dialogs open * add variadic vbamDebug(const char* format, ...) function, active only #ifdef DEBUG, which sets the wx log target to STDERR and logs a message to it * use full name of app "visualboyadvance-m" instead of "vbam" when getting configuration paths, this way the config is saved to ~/Library/Application Support/visualboyadvance-m rather than ~/Library/Application Support/vbam * listen to the MENU_HIGHLIGHT_ALL event as well, as an extra way to check when the menus are open * add public MainFrame::SetMenusOpened(bool state) method to force the main frame to change the internal menus_opened state, this is necessary because in HiDPI mode on Mac the keyboard accelerator for toggle fullscreen sends a menu open event, but not a menu close event, so on switch to fullscreen the state is changed to menus closed and the emu is unpaused TODO: * GUI option to change toggle fullscreen behavior between native and non-native fullscreen on Mac * GUI support for double config values like Display/Scale * add HiDPI support to simple renderer * fix SDL sound, or disable the option * fix Cairo suport on Mac, or disable the option * use dynamic_cast<> to implement GetWindow() for DrawingPanel instead of pure virtual method, likewise for Delete() * link .app statically by default so it can be shipped * add Homebrew formula
2016-10-22 12:20:46 +00:00
# Add support for Homebrew, MacPorts and Fink on OS X
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(APPLE)
include(MacPackageManagers)
endif()
more minor improvements for OS X build Add Homebrew and MacPorts paths for findings headers and libraries. Add -x objective-c++ to the C++ compile command so that conditionally compiled ObjectiveC code for OS X can be supported. Throw a fatal error if the user tries to enable ENABLE_ASM_CORE, ENABLE_ASM_SCALERS or ENABLE_MMX on AMD64, as this is not supported yet. If ENABLE_ASM_SCALERS is enabled, try to find a Homebrew or MacPorts nasm before using the outdated XCode nasm. For the future, if the user has only the old XCode nasm which does not support 64 bit objects and the build is 64 bit, throw a fatal error. For 32 bit builds with the old XCode nasm, use -f macho instead of -f macho32, which is used if the version of nasm is > 2.0 . Pass -DMACHO instead of -DELF and, on AMD64 (for the future) -D__AMD64__ for nasm on OS X. Pass -D__AMD64__ to C++ compilation as well on AMD64, this will help when we support AMD64 inline assembly. Add support for automatically linking Homebrew keg-only gettext from /usr/local/opt/gettext for ENABLE_NLS. Fix copying Info.plist and vbam.icns to the .app bundle. Add a key to the Info.plist to support sharp text on retina displays, as per: https://wiki.wxwidgets.org/WxMac-specific_topics#Retina_display_support Set wxWidgets_USE_DEBUG to ON if CMAKE_BUILD_TYPE is "Debug". I'm not sure this does anything or if I'm doing this correctly though. Also set wxWidgets_USE_UNICODE to ON. Again, I'm not sure this does anything or is in the right place. Fix a bug in the config dir finding code in wxvbamApp::GetConfigurationPath() updated in 8b8f2f7 to only use the more top level dirs if there is a vbam.ini in them, not if they are writable as well, and use the reverse order (starting with user local dirs) to check for writable dirs and their writable parents. This fixes a problem with the vbam.ini being written to the Plugins directory of the .app bundle if it's writable instead of ~/Library/Application Support/vbam as was intended.
2015-11-17 02:56:23 +00:00
# We do not support amd64 asm yet
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(AMD64 AND (ENABLE_ASM_CORE OR ENABLE_ASM_SCALERS OR ENABLE_MMX))
message(FATAL_ERROR "The options ASM_CORE, ASM_SCALERS and MMX are not supported on AMD64 yet.")
endif()
more minor improvements for OS X build Add Homebrew and MacPorts paths for findings headers and libraries. Add -x objective-c++ to the C++ compile command so that conditionally compiled ObjectiveC code for OS X can be supported. Throw a fatal error if the user tries to enable ENABLE_ASM_CORE, ENABLE_ASM_SCALERS or ENABLE_MMX on AMD64, as this is not supported yet. If ENABLE_ASM_SCALERS is enabled, try to find a Homebrew or MacPorts nasm before using the outdated XCode nasm. For the future, if the user has only the old XCode nasm which does not support 64 bit objects and the build is 64 bit, throw a fatal error. For 32 bit builds with the old XCode nasm, use -f macho instead of -f macho32, which is used if the version of nasm is > 2.0 . Pass -DMACHO instead of -DELF and, on AMD64 (for the future) -D__AMD64__ for nasm on OS X. Pass -D__AMD64__ to C++ compilation as well on AMD64, this will help when we support AMD64 inline assembly. Add support for automatically linking Homebrew keg-only gettext from /usr/local/opt/gettext for ENABLE_NLS. Fix copying Info.plist and vbam.icns to the .app bundle. Add a key to the Info.plist to support sharp text on retina displays, as per: https://wiki.wxwidgets.org/WxMac-specific_topics#Retina_display_support Set wxWidgets_USE_DEBUG to ON if CMAKE_BUILD_TYPE is "Debug". I'm not sure this does anything or if I'm doing this correctly though. Also set wxWidgets_USE_UNICODE to ON. Again, I'm not sure this does anything or is in the right place. Fix a bug in the config dir finding code in wxvbamApp::GetConfigurationPath() updated in 8b8f2f7 to only use the more top level dirs if there is a vbam.ini in them, not if they are writable as well, and use the reverse order (starting with user local dirs) to check for writable dirs and their writable parents. This fixes a problem with the vbam.ini being written to the Plugins directory of the .app bundle if it's writable instead of ~/Library/Application Support/vbam as was intended.
2015-11-17 02:56:23 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(ENABLE_ASM_CORE OR ENABLE_ASM_SCALERS)
cmake: Visual Studio misc followup on cf9a88df. Fix the vcpkg root setting, which was trying to use CMAKE_PROJECT_DIR before a project is defined by switching back to CMAKE_SOURCE_DIR. Also check if the user has \vcpkg or c:\vcpkg and use those if found. Use \vcpkg if ENV{CI} is set, e.g. on Appveyor. Enable nasm for visual studio builds by using the nuget nasm2 package. In Architecture.cmake check that the vcpkg arch matches the compiler arch, and throw a fatal error otherwise. When using GLOB to find the nuget package directory, use the package name as the prefix, this is quite necessary when using multiple nuget packages. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-15 19:34:18 +00:00
if(MSVC)
if(NOT EXISTS ${CMAKE_BINARY_DIR}/nuget.exe)
file(DOWNLOAD "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" ${CMAKE_BINARY_DIR}/nuget.exe)
endif()
execute_process(
COMMAND nuget.exe install nasm2 -OutputDirectory ${CMAKE_BINARY_DIR}/nuget
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
file(GLOB pkg ${CMAKE_BINARY_DIR}/nuget/nasm2*)
list(APPEND CMAKE_PROGRAM_PATH ${pkg}/tools)
endif()
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
enable_language(ASM_NASM)
cmake: Visual Studio misc followup on cf9a88df. Fix the vcpkg root setting, which was trying to use CMAKE_PROJECT_DIR before a project is defined by switching back to CMAKE_SOURCE_DIR. Also check if the user has \vcpkg or c:\vcpkg and use those if found. Use \vcpkg if ENV{CI} is set, e.g. on Appveyor. Enable nasm for visual studio builds by using the nuget nasm2 package. In Architecture.cmake check that the vcpkg arch matches the compiler arch, and throw a fatal error otherwise. When using GLOB to find the nuget package directory, use the package name as the prefix, this is quite necessary when using multiple nuget packages. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-15 19:34:18 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
set(ASM_ENABLED ON)
endif()
CMAKE: Clarify CMakeLists.txt a bit
2011-02-24 11:14:59 +00:00
fix the cmake/linux build moves dependencies/File_Extractor-1.0.0 to trunk/fex - we can't expect people to have this lib, and fex has dropped support for the "fex_mini".
2010-03-15 03:36:45 +00:00
# Look for some dependencies using CMake scripts
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
find_package(ZLIB REQUIRED)
wx 2.8 compat fixes, centos support, cmake fixes Add support for RHEL/centos to installdeps. There is no SFML package. Add some string compatibility stuff so that everything builds on wx 2.8 unicode builds. TODO: add travis slaves for 2.8, with and without unicode Disable the game frame spacer code on 2.8 because it does not work (the frame does not expand.) cmake improvements: - set ENABLE_LTO=OFF for Debug builds by default - set ENABLE_LINK=OFF if SFML cannot be found and continue - use better logic for finding wx utilities wx-config and wxrc Signed-off-by: Rafael Kitover <rkitover@gmail.com> Closes #395 Closes #297
2019-03-28 21:45:06 +00:00
cmake: use LEGACY OpenGL on FreeBSD only 2fedaa63 Black screen reported on linux with `LEGACY` OpenGL type, set it back to `GLVND` and only use `LEGACY` on FreeBSD. Broken in 2fedaa63. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-04-27 22:52:42 +00:00
set(OpenGL_GL_PREFERENCE GLVND)
if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
set(OpenGL_GL_PREFERENCE LEGACY)
endif()
wx 2.8 compat fixes, centos support, cmake fixes Add support for RHEL/centos to installdeps. There is no SFML package. Add some string compatibility stuff so that everything builds on wx 2.8 unicode builds. TODO: add travis slaves for 2.8, with and without unicode Disable the game frame spacer code on 2.8 because it does not work (the frame does not expand.) cmake improvements: - set ENABLE_LTO=OFF for Debug builds by default - set ENABLE_LINK=OFF if SFML cannot be found and continue - use better logic for finding wx utilities wx-config and wxrc Signed-off-by: Rafael Kitover <rkitover@gmail.com> Closes #395 Closes #297
2019-03-28 21:45:06 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
find_package(OpenGL REQUIRED)
cmake: Visual Studio support improvements. Add support for vcpkg ffmpeg, this requires using someone's FindFFmpeg.cmake instead of relying on pkg-config, since vcpkg does not have pkg-config. Do not use the ffmpeg from vcpkg on appveyor however, because that pushes the build cache generation over the time limit for jobs. Add secur32 and bcrypt to the list of ffmpeg libs on windows, these are standard windows libraries. Change some code in ffmpeg.cpp to remove C-style casts of struct initializers, which are illegal in MSVC. Add the INT64_C and UINT64_C macros missing in MSVC's stdint.h (if not defined) to ffmpeg.h before the ffmpeg headers are included, because they rely on them. Rewrite the wxWidgets finding code for the vcpkg wxWidgets to be nicer and work correctly for debug and static builds. Remove all /W* and /w* warnings options from cmake compiler flags, and replace them with /W4 for debug builds, and /w (no warnings) for release modes. When building a static binary, remove all /MD* flags from cmake compiler flags, and use /MT for static release builds and /MTd for static debug builds. Improve the vcpkg toolchain wrapper to only rebuild the vcpkg binary if there were git updates. Redo the handling of SDL2 and SDL_main. Only link SDL2Main to the SDL binary and don't use the definitions. Update CMakeSettings.json to use Ninja and include static configurations. Use CMAKE_PROJECT_DIR instead of CMAKE_SOURCE_DIR to determine the vcpkg root, as CMAKE_SOURCE_DIR is sometimes set incorrectly in the 2017 GUI. Add /nodefaultlib:libcmt to the debug build link flags, as in debug builds libcmtd is used and libcmt should not be. Add /subsystem:console to debug build link flags to produce a windows console app for debug builds, like we do for mingw builds. To do this, define a WIN32_CONSOLE_APP macro and if set, define a main() that calls WinMain(). Call wxMesdsageOutput::Set() in OnInit with an instance of wxMessageOutputStderr for windows debug builds to make sure the --help text etc. goes to the console instead of a popup box. Update the Visual Studio related text in README.md. Fix dynamic debug builds by linking to the debug version of SDL2 and copying the debug version of the dll to the build dir. Fix issue in MainFrame::BindAppIcon with the function we are using not being found in a Windows DLL in debug builds by using wxDynamicLibrary::GetSymboolAorW() instead of GetSymbol(). Enable LTO for MSVC in Release modes, if the option is set. Change appveyor config to use an 8 item build matrix of x64/x86 / Release/Debug / Static/Dynamic. And test the binary in debug modes by running --help. When copying the wxrc.exe out of the build tree, copy both the release and debug versions, this is so that appveyor caching of vcpkg works, since the build trees are not cached. Add some necessary win32 libraries to the SDL binary. And enable building it on appveyor. Fix #465. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-10 11:13:58 +00:00
find_package(SDL2 REQUIRED)
CMAKE: Clarify CMakeLists.txt a bit
2011-02-24 11:14:59 +00:00
cmake: add -lSetupAPI to SDL2 libs for win32 Fix for undefined reference errors linking for msys2 mingw build using the scripts. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-04-15 03:28:18 +00:00
if(WIN32)
builder: Link setupapi always, update libpng. On Windows always link setupapi with SDL2, the find_library() call with SetupAPI was failing on mingw because of case. Update libpng 1.6.32 -> 1.6.37. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-08 15:28:03 +00:00
set(SDL2_LIBRARY ${SDL2_LIBRARY} setupapi)
cmake: add -lSetupAPI to SDL2 libs for win32 Fix for undefined reference errors linking for msys2 mingw build using the scripts. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-04-15 03:28:18 +00:00
endif()
all current vba-m Wx patches applied to trunk.
2011-05-25 11:55:46 +00:00
# set the standard libraries all ports use
cmake: refactor, better clang support Do some reformatting towards the more modern cmake style. Clean up some code. Support linking to gcc compiled wxWidgets by setting `-D__GXX_ABI_VERSION=` appropriately for clang. Use the new method of calling `FindwxWidgets.cmake`, the old method causes some problems now. Set all necessary policies in both cmake files. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-27 03:25:43 +00:00
set(
VBAMCORE_LIBS
all current vba-m Wx patches applied to trunk.
2011-05-25 11:55:46 +00:00
vbamcore
fex
<wip> Migration to SDL2 made possible by galtgendo, gtk changes to follow.
2015-11-19 02:34:38 +00:00
${SDL2_LIBRARY}
Updated the FindSFML cmake script to the SFML-2.2 version
2015-05-06 01:27:09 +00:00
${SFML_LIBRARIES}
all current vba-m Wx patches applied to trunk.
2011-05-25 11:55:46 +00:00
${OPENGL_LIBRARIES}
${ZLIB_LIBRARY}
cmakelists changes, wxwidgets interface build fix to follow.
2015-03-27 17:48:42 +00:00
)
CMAKE: Clarify CMakeLists.txt a bit
2011-02-24 11:14:59 +00:00
buncha patches by darktjm sdl fix not applied yet
2011-05-24 07:39:29 +00:00
if(ENABLE_FFMPEG)
cmake: Visual Studio support improvements. Add support for vcpkg ffmpeg, this requires using someone's FindFFmpeg.cmake instead of relying on pkg-config, since vcpkg does not have pkg-config. Do not use the ffmpeg from vcpkg on appveyor however, because that pushes the build cache generation over the time limit for jobs. Add secur32 and bcrypt to the list of ffmpeg libs on windows, these are standard windows libraries. Change some code in ffmpeg.cpp to remove C-style casts of struct initializers, which are illegal in MSVC. Add the INT64_C and UINT64_C macros missing in MSVC's stdint.h (if not defined) to ffmpeg.h before the ffmpeg headers are included, because they rely on them. Rewrite the wxWidgets finding code for the vcpkg wxWidgets to be nicer and work correctly for debug and static builds. Remove all /W* and /w* warnings options from cmake compiler flags, and replace them with /W4 for debug builds, and /w (no warnings) for release modes. When building a static binary, remove all /MD* flags from cmake compiler flags, and use /MT for static release builds and /MTd for static debug builds. Improve the vcpkg toolchain wrapper to only rebuild the vcpkg binary if there were git updates. Redo the handling of SDL2 and SDL_main. Only link SDL2Main to the SDL binary and don't use the definitions. Update CMakeSettings.json to use Ninja and include static configurations. Use CMAKE_PROJECT_DIR instead of CMAKE_SOURCE_DIR to determine the vcpkg root, as CMAKE_SOURCE_DIR is sometimes set incorrectly in the 2017 GUI. Add /nodefaultlib:libcmt to the debug build link flags, as in debug builds libcmtd is used and libcmt should not be. Add /subsystem:console to debug build link flags to produce a windows console app for debug builds, like we do for mingw builds. To do this, define a WIN32_CONSOLE_APP macro and if set, define a main() that calls WinMain(). Call wxMesdsageOutput::Set() in OnInit with an instance of wxMessageOutputStderr for windows debug builds to make sure the --help text etc. goes to the console instead of a popup box. Update the Visual Studio related text in README.md. Fix dynamic debug builds by linking to the debug version of SDL2 and copying the debug version of the dll to the build dir. Fix issue in MainFrame::BindAppIcon with the function we are using not being found in a Windows DLL in debug builds by using wxDynamicLibrary::GetSymboolAorW() instead of GetSymbol(). Enable LTO for MSVC in Release modes, if the option is set. Change appveyor config to use an 8 item build matrix of x64/x86 / Release/Debug / Static/Dynamic. And test the binary in debug modes by running --help. When copying the wxrc.exe out of the build tree, copy both the release and debug versions, this is so that appveyor caching of vcpkg works, since the build trees are not cached. Add some necessary win32 libraries to the SDL binary. And enable building it on appveyor. Fix #465. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-10 11:13:58 +00:00
if(NOT FFMPEG_LIBRARIES)
message(FATAL_ERROR "ENABLE_FFMPEG was specified, but required versions of ffmpeg libraries cannot be found!")
endif()
mac build/builder improvements Improve, refactor and clean up `tools/osx/builder` to build a relatively full-featured ffmpeg as well. This requires lots of other dists. It's kind of like a mini port system now. Will generalize it shortly to a sourced library for using with both the mac and the mingw builds. Will hopefully become a separate repo on github at some point. Add perl dist support to the builder. Add an `--env` flag to the builder to print the build environment variables so that they can be read in with `eval` for debugging purposes. Also add the `FFMPEG_STATIC` cmake option to link static ffmpeg libraries correctly. Move the codesigning and zipping of the `.app` bundle to the builder script and out of cmake, as this is something most users don't need.
2017-10-22 22:35:56 +00:00
cmake: Visual Studio support improvements. Add support for vcpkg ffmpeg, this requires using someone's FindFFmpeg.cmake instead of relying on pkg-config, since vcpkg does not have pkg-config. Do not use the ffmpeg from vcpkg on appveyor however, because that pushes the build cache generation over the time limit for jobs. Add secur32 and bcrypt to the list of ffmpeg libs on windows, these are standard windows libraries. Change some code in ffmpeg.cpp to remove C-style casts of struct initializers, which are illegal in MSVC. Add the INT64_C and UINT64_C macros missing in MSVC's stdint.h (if not defined) to ffmpeg.h before the ffmpeg headers are included, because they rely on them. Rewrite the wxWidgets finding code for the vcpkg wxWidgets to be nicer and work correctly for debug and static builds. Remove all /W* and /w* warnings options from cmake compiler flags, and replace them with /W4 for debug builds, and /w (no warnings) for release modes. When building a static binary, remove all /MD* flags from cmake compiler flags, and use /MT for static release builds and /MTd for static debug builds. Improve the vcpkg toolchain wrapper to only rebuild the vcpkg binary if there were git updates. Redo the handling of SDL2 and SDL_main. Only link SDL2Main to the SDL binary and don't use the definitions. Update CMakeSettings.json to use Ninja and include static configurations. Use CMAKE_PROJECT_DIR instead of CMAKE_SOURCE_DIR to determine the vcpkg root, as CMAKE_SOURCE_DIR is sometimes set incorrectly in the 2017 GUI. Add /nodefaultlib:libcmt to the debug build link flags, as in debug builds libcmtd is used and libcmt should not be. Add /subsystem:console to debug build link flags to produce a windows console app for debug builds, like we do for mingw builds. To do this, define a WIN32_CONSOLE_APP macro and if set, define a main() that calls WinMain(). Call wxMesdsageOutput::Set() in OnInit with an instance of wxMessageOutputStderr for windows debug builds to make sure the --help text etc. goes to the console instead of a popup box. Update the Visual Studio related text in README.md. Fix dynamic debug builds by linking to the debug version of SDL2 and copying the debug version of the dll to the build dir. Fix issue in MainFrame::BindAppIcon with the function we are using not being found in a Windows DLL in debug builds by using wxDynamicLibrary::GetSymboolAorW() instead of GetSymbol(). Enable LTO for MSVC in Release modes, if the option is set. Change appveyor config to use an 8 item build matrix of x64/x86 / Release/Debug / Static/Dynamic. And test the binary in debug modes by running --help. When copying the wxrc.exe out of the build tree, copy both the release and debug versions, this is so that appveyor caching of vcpkg works, since the build trees are not cached. Add some necessary win32 libraries to the SDL binary. And enable building it on appveyor. Fix #465. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-10 11:13:58 +00:00
if(APPLE)
set(FFMPEG_LDFLAGS ${FFMPEG_LDFLAGS} -framework CoreText -framework ApplicationServices)
mac build/builder improvements Improve, refactor and clean up `tools/osx/builder` to build a relatively full-featured ffmpeg as well. This requires lots of other dists. It's kind of like a mini port system now. Will generalize it shortly to a sourced library for using with both the mac and the mingw builds. Will hopefully become a separate repo on github at some point. Add perl dist support to the builder. Add an `--env` flag to the builder to print the build environment variables so that they can be read in with `eval` for debugging purposes. Also add the `FFMPEG_STATIC` cmake option to link static ffmpeg libraries correctly. Move the codesigning and zipping of the `.app` bundle to the builder script and out of cmake, as this is something most users don't need.
2017-10-22 22:35:56 +00:00
endif()
cmake: Visual Studio support improvements. Add support for vcpkg ffmpeg, this requires using someone's FindFFmpeg.cmake instead of relying on pkg-config, since vcpkg does not have pkg-config. Do not use the ffmpeg from vcpkg on appveyor however, because that pushes the build cache generation over the time limit for jobs. Add secur32 and bcrypt to the list of ffmpeg libs on windows, these are standard windows libraries. Change some code in ffmpeg.cpp to remove C-style casts of struct initializers, which are illegal in MSVC. Add the INT64_C and UINT64_C macros missing in MSVC's stdint.h (if not defined) to ffmpeg.h before the ffmpeg headers are included, because they rely on them. Rewrite the wxWidgets finding code for the vcpkg wxWidgets to be nicer and work correctly for debug and static builds. Remove all /W* and /w* warnings options from cmake compiler flags, and replace them with /W4 for debug builds, and /w (no warnings) for release modes. When building a static binary, remove all /MD* flags from cmake compiler flags, and use /MT for static release builds and /MTd for static debug builds. Improve the vcpkg toolchain wrapper to only rebuild the vcpkg binary if there were git updates. Redo the handling of SDL2 and SDL_main. Only link SDL2Main to the SDL binary and don't use the definitions. Update CMakeSettings.json to use Ninja and include static configurations. Use CMAKE_PROJECT_DIR instead of CMAKE_SOURCE_DIR to determine the vcpkg root, as CMAKE_SOURCE_DIR is sometimes set incorrectly in the 2017 GUI. Add /nodefaultlib:libcmt to the debug build link flags, as in debug builds libcmtd is used and libcmt should not be. Add /subsystem:console to debug build link flags to produce a windows console app for debug builds, like we do for mingw builds. To do this, define a WIN32_CONSOLE_APP macro and if set, define a main() that calls WinMain(). Call wxMesdsageOutput::Set() in OnInit with an instance of wxMessageOutputStderr for windows debug builds to make sure the --help text etc. goes to the console instead of a popup box. Update the Visual Studio related text in README.md. Fix dynamic debug builds by linking to the debug version of SDL2 and copying the debug version of the dll to the build dir. Fix issue in MainFrame::BindAppIcon with the function we are using not being found in a Windows DLL in debug builds by using wxDynamicLibrary::GetSymboolAorW() instead of GetSymbol(). Enable LTO for MSVC in Release modes, if the option is set. Change appveyor config to use an 8 item build matrix of x64/x86 / Release/Debug / Static/Dynamic. And test the binary in debug modes by running --help. When copying the wxrc.exe out of the build tree, copy both the release and debug versions, this is so that appveyor caching of vcpkg works, since the build trees are not cached. Add some necessary win32 libraries to the SDL binary. And enable building it on appveyor. Fix #465. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-10 11:13:58 +00:00
else()
add_definitions(-DNO_FFMPEG)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
endif()
buncha patches by darktjm sdl fix not applied yet
2011-05-24 07:39:29 +00:00
[LINUX] Add option to disable the online updater. Add option to remove all configuration related to checking for updates online. Although it is not implemented at the moment, these options appeared on our menu `Options` > `General ...`. - Fix need of patch on #140.
2019-07-10 23:47:16 +00:00
if(NOT ENABLE_ONLINEUPDATES)
add_definitions(-DNO_ONLINEUPDATES)
endif()
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(ENABLE_LIRC)
cmake: refactor, better clang support Do some reformatting towards the more modern cmake style. Clean up some code. Support linking to gcc compiled wxWidgets by setting `-D__GXX_ABI_VERSION=` appropriately for clang. Use the new method of calling `FindwxWidgets.cmake`, the old method causes some problems now. Set all necessary policies in both cmake files. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-27 03:25:43 +00:00
set(WITHLIRC 1)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
else()
cmake: refactor, better clang support Do some reformatting towards the more modern cmake style. Clean up some code. Support linking to gcc compiled wxWidgets by setting `-D__GXX_ABI_VERSION=` appropriately for clang. Use the new method of calling `FindwxWidgets.cmake`, the old method causes some problems now. Set all necessary policies in both cmake files. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-27 03:25:43 +00:00
set(WITHLIRC 0)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
endif()
Fixing file.
2008-06-06 10:17:20 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
include(GNUInstallDirs)
Fixing file.
2008-06-06 10:17:20 +00:00
# C defines
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
add_definitions(-DHAVE_NETINET_IN_H -DHAVE_ARPA_INET_H -DHAVE_ZLIB_H -DFINAL_VERSION -DSDL -DUSE_OPENGL -DSYSCONF_INSTALL_DIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}" -DWITH_LIRC=${WITHLIRC})
add_definitions(-DPKGDATADIR="${CMAKE_INSTALL_FULL_DATADIR}/vbam" -DPACKAGE=)
Fixing file.
2008-06-06 10:17:20 +00:00
build fixes: ffmpeg, xbrz, travis, C++ version Fix the cmake ffmpeg detection and make it not print the detection messages twice. Add `-D__STDC_FORMAT_MACROS` to compiler flags, some versions of ffmpeg require this. Redefine `static_assert(x)` to the `static_assert(x, msg)` form in `xbrz.cpp`. This is a C++17 feature and some versions of gcc wrongly set `__cpp_static_assert` even though they do not support it. Also we want to stick to C++11 for the time being, until there is consensus to support a newer a version. For that reason, change the MSVC flag `/std:c++latest` to `/std:c++11` as well. Remove `-DENABLE_OPENAL=ON` and `-DENABLE_LINK=ON` from travis config, as these are now automatic. In `installdeps` remove the hacks for supporting the `https://` apt url for mxe and use an `http://` url instead. This works perfectly on Ubuntu 14 (trusty). Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-08-31 22:58:59 +00:00
add_definitions(-D__STDC_FORMAT_MACROS)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(ENABLE_LINK)
CMAKE: sem_timedwait is found in pthread on newer linuxes
2012-09-07 19:09:16 +00:00
# IPC linking code needs sem_timedwait which can be either in librt or pthreads
msys2: don't try to link msys librt and libpthread In cmake on Win32, don't try to find librt or libpthread using find_library(), and on mingw just include -lpthread. For some reason the msys versions of librt and libpthread were being picked up when find_library() was being used.
2018-08-10 23:47:17 +00:00
if(NOT WIN32)
find_library(RT_LIB rt)
if(RT_LIB)
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${RT_LIB})
set(VBAMCORE_LIBS ${VBAMCORE_LIBS} ${RT_LIB})
endif()
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
endif()
msys2: don't try to link msys librt and libpthread In cmake on Win32, don't try to find librt or libpthread using find_library(), and on mingw just include -lpthread. For some reason the msys versions of librt and libpthread were being picked up when find_library() was being used.
2018-08-10 23:47:17 +00:00
if(NOT WIN32)
find_library(PTHREAD_LIB pthread)
if(PTHREAD_LIB)
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${PTHREAD_LIB})
set(VBAMCORE_LIBS ${VBAMCORE_LIBS} ${PTHREAD_LIB})
endif()
elseif(MINGW)
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} -lpthread)
set(VBAMCORE_LIBS ${VBAMCORE_LIBS} -lpthread)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
endif()
include(CheckFunctionExists)
check_function_exists(sem_timedwait SEM_TIMEDWAIT)
if(SEM_TIMEDWAIT)
add_definitions(-DHAVE_SEM_TIMEDWAIT)
endif()
else()
add_definitions(-DNO_LINK)
endif()
CMAKE: Allow building without SFML
2011-02-20 12:22:58 +00:00
Allow building the GTK port without debugger support
2008-06-16 20:18:49 +00:00
# The debugger is enabled by default
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(NOT ENABLE_DEBUGGER)
add_definitions(-DNO_DEBUGGER)
else()
add_definitions(-DBKPT_SUPPORT)
endif()
Allow building the GTK port without debugger support
2008-06-16 20:18:49 +00:00
Fixing file.
2008-06-06 10:17:20 +00:00
# The ASM core is disabled by default because we don't know on which platform we are
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(NOT ENABLE_ASM_CORE)
add_definitions(-DC_CORE)
endif()
Fixing file.
2008-06-06 10:17:20 +00:00
cmake: Fix localization for Visual Studio. Default to ENABLE_NLS=ON for vcpkg builds too. Check for libintl under both the names "intl" and "libintl", likewise for libiconv. The vcpkg versions have the "lib" prefix. Use the Gettext.Tools package from NuGet for the tools to build the translation files. vcpkg does not yet have gettext-tools. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-12 19:01:58 +00:00
set(NLS_DEFAULT ON)
builder: mingw improvements + misc. - default ENABLE_NLS to ON except for vcpkg, broken in e2f06210 - update zlib URL - use openssl 1.1.1c instead of 1.0.2p, parallel build works now! - add osslsigncode for mingw to codesign windows binaries, and automatically sign in `build_project()` - add curl (for osslsigncode, which needs libcurl) - use current master for wxwidgets instead of 3.1.2 - make the `translations.zip` in `build_project()` for windows - on mac, unlock the login keychain before codesigning (this is necessary if using e.g. ssh.) - do not fail if the user does not have codesigning or gpg keys - fix wxwidgets configure options on mac (need to append to `DIST_CONFIGURE_OVERRIDES` instead of `DIST_ARGS`.) Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-08-19 20:15:01 +00:00
auto deps for visual studio, take 1 Use vcpkg to build deps when Visual Studio on Windows is detected, this only happens on first build, but does take a while because things like wxWidgets need to be built. Building from the developer command line is also supported. I considered making a pre-built tarball available, but the resulting files are just too big for this to be practical. Make the necessary cmake code changes for this to work and to use the vcpkg packages, which work just like on linux or have other cmake glue code available. To do this, we make vcpkg a submodule, use git to checkout all submodules, then just build and use the `vcpkg.exe`. Then we set the CMAKE_TOOLCHAIN_FILE to the vcpkg toolchain and also include it directly, why this is necessary I don't know, without it it doesn't work in the IDE but does on the command line. All of this requires no vcpkg integration with either the user or the project. A user-wide `ENV{VCPKG_ROOT}` is also supported. Fix the dynamic arrays in the GBA core, MSVC follows the C++ standard on this and gcc does not. TODO: add the necessary gcc flags to make this an error in cmake. Use `wxArrayString` instead of `std::vector<wxString>` in `src/wx/strutils.cpp` which is used in options parsing. This was necessary because of a bizarre linker error with wxWidgets when using Visual Studio: https://trac.wxwidgets.org/ticket/10884#comment:46 In `src/wx/panel.cpp` make sure the unimplemented D3D renderer code does not get compiled if it's actually `OFF`. Also fix the new spacer code for the drawing panel to not combine `wxEXPAND` with `wxALIGN_CENTER`, which is an error on wxWidgets 3.1.2, which is what vcpkg uses. The drawing panel seems to be automatically stretched to the max size automatically anyway. TODO: if all of this works, we'll need an Appveyor set up for visual studio. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-21 23:01:46 +00:00
option(ENABLE_NLS "Enable translations" ${NLS_DEFAULT})
GTK: NLS support WIP
2011-02-24 13:06:17 +00:00
# Enable internationalization
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(ENABLE_NLS)
set(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale)
add_definitions(-DENABLE_NLS)
add_definitions(-DLOCALEDIR="${LOCALEDIR}")
all current vba-m Wx patches applied to trunk.
2011-05-25 11:55:46 +00:00
# for now, only GBALink.cpp uses gettext() directly
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(APPLE)
more minor improvements for OS X build Add Homebrew and MacPorts paths for findings headers and libraries. Add -x objective-c++ to the C++ compile command so that conditionally compiled ObjectiveC code for OS X can be supported. Throw a fatal error if the user tries to enable ENABLE_ASM_CORE, ENABLE_ASM_SCALERS or ENABLE_MMX on AMD64, as this is not supported yet. If ENABLE_ASM_SCALERS is enabled, try to find a Homebrew or MacPorts nasm before using the outdated XCode nasm. For the future, if the user has only the old XCode nasm which does not support 64 bit objects and the build is 64 bit, throw a fatal error. For 32 bit builds with the old XCode nasm, use -f macho instead of -f macho32, which is used if the version of nasm is > 2.0 . Pass -DMACHO instead of -DELF and, on AMD64 (for the future) -D__AMD64__ for nasm on OS X. Pass -D__AMD64__ to C++ compilation as well on AMD64, this will help when we support AMD64 inline assembly. Add support for automatically linking Homebrew keg-only gettext from /usr/local/opt/gettext for ENABLE_NLS. Fix copying Info.plist and vbam.icns to the .app bundle. Add a key to the Info.plist to support sharp text on retina displays, as per: https://wiki.wxwidgets.org/WxMac-specific_topics#Retina_display_support Set wxWidgets_USE_DEBUG to ON if CMAKE_BUILD_TYPE is "Debug". I'm not sure this does anything or if I'm doing this correctly though. Also set wxWidgets_USE_UNICODE to ON. Again, I'm not sure this does anything or is in the right place. Fix a bug in the config dir finding code in wxvbamApp::GetConfigurationPath() updated in 8b8f2f7 to only use the more top level dirs if there is a vbam.ini in them, not if they are writable as well, and use the reverse order (starting with user local dirs) to check for writable dirs and their writable parents. This fixes a problem with the vbam.ini being written to the Plugins directory of the .app bundle if it's writable instead of ~/Library/Application Support/vbam as was intended.
2015-11-17 02:56:23 +00:00
# use Homebrew gettext if available
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(EXISTS "/usr/local/opt/gettext")
set(CMAKE_INCLUDE_PATH "${CMAKE_INCLUDE_PATH};/usr/local/opt/gettext/include")
set(CMAKE_LIBRARY_PATH "${CMAKE_LIBRARY_PATH};/usr/local/opt/gettext/lib")
set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};/usr/local/opt/gettext/bin")
endif()
endif()
cmake: Fix localization for Visual Studio. Default to ENABLE_NLS=ON for vcpkg builds too. Check for libintl under both the names "intl" and "libintl", likewise for libiconv. The vcpkg versions have the "lib" prefix. Use the Gettext.Tools package from NuGet for the tools to build the translation files. vcpkg does not yet have gettext-tools. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-12 19:01:58 +00:00
if(ENABLE_LINK OR ENABLE_WX)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
find_path(LIBINTL_INC libintl.h)
builder: minor fixes for mingw. Search the lib-prefixed names of intl/iconv/charset libraries first to avoid dlls being linked. Update toolchain files to include the common source by full path, fixes using them as toolchains for other projects broken in 3edd9ba7. Update URL for nasm, use newer jpeg-turbo, tiff and wx. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2020-02-02 02:14:03 +00:00
find_library(LIBINTL_LIB NAMES libintl intl)
find_library(LIBICONV_LIB NAMES libiconv iconv)
find_library(LIBCHARSET_LIB NAMES libcharset charset)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(LIBINTL_LIB)
cmake: Fix localization for Visual Studio. Default to ENABLE_NLS=ON for vcpkg builds too. Check for libintl under both the names "intl" and "libintl", likewise for libiconv. The vcpkg versions have the "lib" prefix. Use the Gettext.Tools package from NuGet for the tools to build the translation files. vcpkg does not yet have gettext-tools. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-12 19:01:58 +00:00
list(APPEND CMAKE_REQUIRED_LIBRARIES ${LIBINTL_LIB})
list(APPEND VBAMCORE_LIBS ${LIBINTL_LIB})
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
endif()
if(LIBICONV_LIB)
cmake: Fix localization for Visual Studio. Default to ENABLE_NLS=ON for vcpkg builds too. Check for libintl under both the names "intl" and "libintl", likewise for libiconv. The vcpkg versions have the "lib" prefix. Use the Gettext.Tools package from NuGet for the tools to build the translation files. vcpkg does not yet have gettext-tools. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-12 19:01:58 +00:00
list(APPEND CMAKE_REQUIRED_LIBRARIES ${LIBICONV_LIB})
list(APPEND VBAMCORE_LIBS ${LIBICONV_LIB})
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
endif()
cmake: Check for libcharset and use if found. For Visual Studio, the static builds now require linking libcharset explicitly, otherwise an `unresolved external symbol locale_charset` error is thrown during linking. This library is sometimes required on other platforms for iconv/gettext, and checking for it and linking it should be harmless. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2020-01-17 16:03:07 +00:00
if(LIBCHARSET_LIB)
list(APPEND CMAKE_REQUIRED_LIBRARIES ${LIBCHARSET_LIB})
list(APPEND VBAMCORE_LIBS ${LIBCHARSET_LIB})
endif()
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
include(CheckFunctionExists)
check_function_exists(gettext GETTEXT_FN)
if(NOT (LIBINTL_INC OR GETTEXT_FN))
message(FATAL_ERROR "NLS requires libintl/gettext")
endif()
include_directories(${LIBINTL_INC})
endif()
endif()
GTK: NLS support WIP
2011-02-24 13:06:17 +00:00
use num cpu cores to parallelize LTO link with gcc Use the `cmake` `ProcessorCount` module to determine the number of CPU threads, and set the `-flto` flag for gcc to `-flto=${num_cpus}` if the number of CPU threads is detected and is greater than `1`. clang does not support this.
2017-09-19 13:58:48 +00:00
include(ProcessorCount)
ProcessorCount(num_cpus)
detect llvm toolchain utilities #392 Use `clang -print-prog-path=<tool>` to find the locations of llvm toolchain utilities such as `llvm-ranlib` and set the appropriate cmake variables to the resultant paths. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-20 01:41:25 +00:00
# Compiler stuff
if(CMAKE_C_COMPILER_ID STREQUAL Clang AND CMAKE_CXX_COMPILER_ID STREQUAL Clang)
include(LLVMToolchain)
endif()
compile/link flags improvements * Bump minimum cmake required to 3.3.2, to make sure generator expressions work. * Force CMAKE_BUILD_TYPE to "Release" if unset, not sure if this actually works. * Merge the older compile flags block with the new one and use generator expressions to make sure the relevant flags apply only to C, C++ or nasm. * Add -lssp to the end of the link commands for the -fstack-protector* options, this is only needed/done for gcc. * Add -lversion and -limm32 to SDL2_LIBRARY (Zach asked for this.) * Builds on msys2 again!
2016-11-20 19:11:52 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
cmake: check for broken LTO When using LTO with gcc or clang, try to compile and link something to make sure it works, and disable it if it doesn't. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-26 14:49:48 +00:00
unset(LTO_FLAGS)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(ENABLE_LTO)
if(CMAKE_COMPILER_IS_GNUCXX)
use num cpu cores to parallelize LTO link with gcc Use the `cmake` `ProcessorCount` module to determine the number of CPU threads, and set the `-flto` flag for gcc to `-flto=${num_cpus}` if the number of CPU threads is detected and is greater than `1`. clang does not support this.
2017-09-19 13:58:48 +00:00
if(num_cpus GREATER 1)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
set(LTO_FLAGS -flto=${num_cpus} -ffat-lto-objects)
use num cpu cores to parallelize LTO link with gcc Use the `cmake` `ProcessorCount` module to determine the number of CPU threads, and set the `-flto` flag for gcc to `-flto=${num_cpus}` if the number of CPU threads is detected and is greater than `1`. clang does not support this.
2017-09-19 13:58:48 +00:00
else()
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
set(LTO_FLAGS -flto -ffat-lto-objects)
use num cpu cores to parallelize LTO link with gcc Use the `cmake` `ProcessorCount` module to determine the number of CPU threads, and set the `-flto` flag for gcc to `-flto=${num_cpus}` if the number of CPU threads is detected and is greater than `1`. clang does not support this.
2017-09-19 13:58:48 +00:00
endif()
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
else()
set(LTO_FLAGS -flto)
endif()
cmake: check for broken LTO When using LTO with gcc or clang, try to compile and link something to make sure it works, and disable it if it doesn't. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-26 14:49:48 +00:00
# check that LTO is not broken before enabling it
set(ORIG_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${LTO_FLAGS}")
include(CheckCXXSourceCompiles)
check_cxx_source_compiles("int main(int argc, char** argv) { return 0; }" LTO_WORKS)
set(CMAKE_REQUIRED_FLAGS ${ORIG_CMAKE_REQUIRED_FLAGS})
if(NOT LTO_WORKS)
message(WARNING "LTO does not seem to be working on your system, if using clang make sure LLVMGold is installed")
unset(LTO_FLAGS)
set(ENABLE_LTO OFF)
endif()
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
endif()
only use -flto=10 with gcc gcc allows flto=<jobs> to parallelize linking, clang does not understand this, use just -flto for clang and -flto=10 for gcc.
2016-11-23 11:13:33 +00:00
add -mfpmath=sse -msse2 compiler flags: x86/amd64 This may speed things up a little in some places, or maybe not, but should be safe as few if any users are likely to be using a CPU without SSE2.
2017-10-17 17:26:37 +00:00
unset(MY_C_OPT_FLAGS)
if(X86_32 OR AMD64)
set(MY_C_OPT_FLAGS -mfpmath=sse -msse2)
endif()
add LTO support, fix libssp link, add -ggdb3 -Og Add support for Link Time Optimization (LTO) on gcc and Clang. Link libssp only when it is on the system, some toolchains like Ubuntu's do not require explicitly linking to libssp. On Win32 try to link it statically. In debug builds with GCC, use -ggdb3 -Og, otherwise use -g . Two new cmake modules were written for this: * FindSSP.cmake -- this is for finding libssp on the system. * UseGCCBinUtilsWrappers.cmake -- this is for using gcc binutils wrappers such as gcc-ar, which is required for gcc LTO to work. These will be distributed separately as well.
2016-11-21 20:37:21 +00:00
# common optimization flags
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(NOT (APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL Clang AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.3))
set(MY_C_OPT_FLAGS ${MY_C_OPT_FLAGS} -O2 -fomit-frame-pointer ${LTO_FLAGS})
else()
fix build failure on OS X Lion with XCode 4.2 XCode 4.2 generates a broken binary if -fomit-frame-pointer and/or -flto is used for compile and link flags. Check for Clang version less than 4.3 on APPLE and remove these flags in the compile options setting cmake code.
2017-02-03 20:39:10 +00:00
# LTO and -fomit-frame-pointer generate broken binaries on Lion with XCode 4.2 tools
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
set(MY_C_OPT_FLAGS ${MY_C_OPT_FLAGS} -O2)
endif()
only use -mtune=generic on x86/amd64 #146 This flags breaks the build on e.g. ARM, so only use it when a PC architecture (x86 or amd64) has been detected. Thanks to ZachBacon for spotting this.
2017-08-30 21:42:08 +00:00
# only use -mtune=generic on PC architectures
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(X86_32 OR AMD64)
set(MY_C_OPT_FLAGS ${MY_C_OPT_FLAGS} -mtune=generic)
endif()
[LINUX] Add option to disable the online updater. Add option to remove all configuration related to checking for updates online. Although it is not implemented at the moment, these options appeared on our menu `Options` > `General ...`. - Fix need of patch on #140.
2019-07-10 23:47:16 +00:00
add LTO support, fix libssp link, add -ggdb3 -Og Add support for Link Time Optimization (LTO) on gcc and Clang. Link libssp only when it is on the system, some toolchains like Ubuntu's do not require explicitly linking to libssp. On Win32 try to link it statically. In debug builds with GCC, use -ggdb3 -Og, otherwise use -g . Two new cmake modules were written for this: * FindSSP.cmake -- this is for finding libssp on the system. * UseGCCBinUtilsWrappers.cmake -- this is for using gcc binutils wrappers such as gcc-ar, which is required for gcc LTO to work. These will be distributed separately as well.
2016-11-21 20:37:21 +00:00
# common debug flags
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(CMAKE_COMPILER_IS_GNUCXX)
cmake: support libasan/-fsanitize Add the ENABLE_ASAN cmake option, defaulting to `-fsanitize=address` if ON, or the value specified for the option.
2019-01-02 16:23:26 +00:00
set(MY_C_DBG_FLAGS -ggdb3 -Og -fno-omit-frame-pointer)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
else()
cmake: support libasan/-fsanitize Add the ENABLE_ASAN cmake option, defaulting to `-fsanitize=address` if ON, or the value specified for the option.
2019-01-02 16:23:26 +00:00
set(MY_C_DBG_FLAGS -g -fno-omit-frame-pointer)
endif()
Check ASAN support when `ENABLE_ASAN=ON`. We check if the compiler has asan support when the option is enabled. If it does not, then we stop compiling with the proper message. To test this, we use `gcc (GCC) 4.4.7` (no asan support) and `gcc (GCC) 9.1.0` (asan is supported). Call cmake like this: `cmake .. -DCMAKE_BUILD_TYPE=Debug -DENABLE_ASAN=On` and `CXX=g++-4.4 cmake .. -DCMAKE_BUILD_TYPE=Debug -DENABLE_ASAN=On` we then check that it fails for the older version and it works for the newer gcc, like expected. - Fix #409.
2019-09-02 20:17:52 +00:00
include(CheckCXXCompilerFlag)
cmake: support libasan/-fsanitize Add the ENABLE_ASAN cmake option, defaulting to `-fsanitize=address` if ON, or the value specified for the option.
2019-01-02 16:23:26 +00:00
if(ENABLE_ASAN)
string(TOLOWER ${CMAKE_BUILD_TYPE} build)
if(NOT build STREQUAL "debug")
message(FATAL_ERROR "asan requires debug build, set -DCMAKE_BUILD_TYPE=Debug")
endif()
string(TOLOWER ${ENABLE_ASAN} SANITIZER)
if(SANITIZER STREQUAL "on" OR SANITIZER STREQUAL "true")
set(SANITIZER address)
endif()
cmake: Fix ENABLE_ASAN with clang. Only -fsanitize=address is needed for asan to work with both gcc and clang. [170/196] Building CXX object CMakeFiles/vbamcore.dir/src/Util.cpp.o clang-9: warning: -lasan: 'linker' input unused [-Wunused-command-line-argument] [171/196] Linking CXX static library libvbamcore.a [172/196] Generating cmdtab.cpp, cmdhandlers.h, cmd-evtable.h [173/196] Generating wxvbam.xrs [174/196] Generating builtin-xrc.h samu: job failed: cd /tmp/visualboyadvance-m/build/src/wx && /tmp/visualboyadvance-m/build/bin2c wxvbam.xrs builtin-xrc.h builtin_xrs ==4845==Your application is linked against incompatible ASan runtimes. samu: subcommand failed
2019-10-10 00:52:50 +00:00
list(PREPEND CMAKE_REQUIRED_LIBRARIES -fsanitize=${SANITIZER})
check_cxx_compiler_flag("-fsanitize=${SANITIZER}" ASAN_SUPPORT_FLAG)
Check ASAN support when `ENABLE_ASAN=ON`. We check if the compiler has asan support when the option is enabled. If it does not, then we stop compiling with the proper message. To test this, we use `gcc (GCC) 4.4.7` (no asan support) and `gcc (GCC) 9.1.0` (asan is supported). Call cmake like this: `cmake .. -DCMAKE_BUILD_TYPE=Debug -DENABLE_ASAN=On` and `CXX=g++-4.4 cmake .. -DCMAKE_BUILD_TYPE=Debug -DENABLE_ASAN=On` we then check that it fails for the older version and it works for the newer gcc, like expected. - Fix #409.
2019-09-02 20:17:52 +00:00
if(${ASAN_SUPPORT_FLAG})
cmake: Fix ENABLE_ASAN with clang. Only -fsanitize=address is needed for asan to work with both gcc and clang. [170/196] Building CXX object CMakeFiles/vbamcore.dir/src/Util.cpp.o clang-9: warning: -lasan: 'linker' input unused [-Wunused-command-line-argument] [171/196] Linking CXX static library libvbamcore.a [172/196] Generating cmdtab.cpp, cmdhandlers.h, cmd-evtable.h [173/196] Generating wxvbam.xrs [174/196] Generating builtin-xrc.h samu: job failed: cd /tmp/visualboyadvance-m/build/src/wx && /tmp/visualboyadvance-m/build/bin2c wxvbam.xrs builtin-xrc.h builtin_xrs ==4845==Your application is linked against incompatible ASan runtimes. samu: subcommand failed
2019-10-10 00:52:50 +00:00
list(PREPEND MY_C_DBG_FLAGS -fsanitize=${SANITIZER})
Check ASAN support when `ENABLE_ASAN=ON`. We check if the compiler has asan support when the option is enabled. If it does not, then we stop compiling with the proper message. To test this, we use `gcc (GCC) 4.4.7` (no asan support) and `gcc (GCC) 9.1.0` (asan is supported). Call cmake like this: `cmake .. -DCMAKE_BUILD_TYPE=Debug -DENABLE_ASAN=On` and `CXX=g++-4.4 cmake .. -DCMAKE_BUILD_TYPE=Debug -DENABLE_ASAN=On` we then check that it fails for the older version and it works for the newer gcc, like expected. - Fix #409.
2019-09-02 20:17:52 +00:00
else()
message(FATAL_ERROR "asan not available to compiler.")
endif()
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
endif()
add LTO support, fix libssp link, add -ggdb3 -Og Add support for Link Time Optimization (LTO) on gcc and Clang. Link libssp only when it is on the system, some toolchains like Ubuntu's do not require explicitly linking to libssp. On Win32 try to link it statically. In debug builds with GCC, use -ggdb3 -Og, otherwise use -g . Two new cmake modules were written for this: * FindSSP.cmake -- this is for finding libssp on the system. * UseGCCBinUtilsWrappers.cmake -- this is for using gcc binutils wrappers such as gcc-ar, which is required for gcc LTO to work. These will be distributed separately as well.
2016-11-21 20:37:21 +00:00
compile/link flags improvements * Bump minimum cmake required to 3.3.2, to make sure generator expressions work. * Force CMAKE_BUILD_TYPE to "Release" if unset, not sure if this actually works. * Merge the older compile flags block with the new one and use generator expressions to make sure the relevant flags apply only to C, C++ or nasm. * Add -lssp to the end of the link commands for the -fstack-protector* options, this is only needed/done for gcc. * Add -lversion and -limm32 to SDL2_LIBRARY (Zach asked for this.) * Builds on msys2 again!
2016-11-20 19:11:52 +00:00
# common flags
cmake: Silence _FORTIFY_SOURCE warnings with debug builds. [79/196] Building CXX object fex/CMakeFiles/fex.dir/fex/Zlib_Inflater.cpp.o In file included from ../fex/fex/Zlib_Inflater.cpp:3: In file included from ../fex/fex/Zlib_Inflater.h:7: In file included from ../fex/fex/Data_Reader.h:7: In file included from ../fex/fex/blargg_common.h:8: In file included from /usr/include/assert.h:35: /usr/include/features.h:382:4: warning: _FORTIFY_SOURCE requires compiling with optimization (-O) [-W#warnings] ^ 1 warning generated.
2019-10-08 22:52:06 +00:00
set(MY_C_FLAGS -pipe -Wformat -Wformat-security -feliminate-unused-debug-types)
cmake: fix linking to libssp and linking bin2c Only add the macro `-D_FORTIFY_SOURCE=2` if we are linking to libssp with gcc, do not use it at all on clang. For `HostCompile.cmake` add the macro `-Dmain=main` to redefine the macro added by SDL2 to compile flags `-Dmain=SDL_main`. Fix #548. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-10-17 21:53:15 +00:00
if(ENABLE_SSP AND CMAKE_BUILD_TYPE STREQUAL Debug)
if(WIN32)
set(SSP_STATIC ON)
endif()
find_package(SSP)
if(SSP_LIBRARY)
list(APPEND MY_C_FLAGS -D_FORTIFY_SOURCE=2)
list(APPEND MY_C_LINKER_FLAGS ${SSP_LIBRARY})
endif()
cmake: Silence _FORTIFY_SOURCE warnings with debug builds. [79/196] Building CXX object fex/CMakeFiles/fex.dir/fex/Zlib_Inflater.cpp.o In file included from ../fex/fex/Zlib_Inflater.cpp:3: In file included from ../fex/fex/Zlib_Inflater.h:7: In file included from ../fex/fex/Data_Reader.h:7: In file included from ../fex/fex/blargg_common.h:8: In file included from /usr/include/assert.h:35: /usr/include/features.h:382:4: warning: _FORTIFY_SOURCE requires compiling with optimization (-O) [-W#warnings] ^ 1 warning generated.
2019-10-08 22:52:06 +00:00
endif()
pass all compiler/linker flags for compile test When determining gcc/clang flags, save resulting C flags as MY_C_FLAGS, C++ flags as MY_CXX_FLAGS, and linker flags as MY_C_LINKER_FLAGS, then use them in the Wx OpenGL compile test. This fixes the test erroneously failing on git mxe on mac. Also, don't use -fPIC on Win32, set Wx defines separately from the test, and save all CMAKE_REQUIRED_* variables before the test and restore them afterwards.
2017-03-08 00:15:02 +00:00
cmake: do not use -fPIC on 32 bit x86, breaks asm Do not add the -fPIC (position independent code) compiler flag on 32 bit x86 architectures because that breaks inline assembly, and some included libraries like fex require inline assembly to work. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-02-22 14:53:51 +00:00
if(NOT (WIN32 OR X86_32)) # inline asm is not allowed with -fPIC
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
set(MY_C_FLAGS ${MY_C_FLAGS} -fPIC)
endif()
compile/link flags improvements * Bump minimum cmake required to 3.3.2, to make sure generator expressions work. * Force CMAKE_BUILD_TYPE to "Release" if unset, not sure if this actually works. * Merge the older compile flags block with the new one and use generator expressions to make sure the relevant flags apply only to C, C++ or nasm. * Add -lssp to the end of the link commands for the -fstack-protector* options, this is only needed/done for gcc. * Add -lversion and -limm32 to SDL2_LIBRARY (Zach asked for this.) * Builds on msys2 again!
2016-11-20 19:11:52 +00:00
activate libssp compiler flags for gcc only In 82c8a1e3 I made "--param ssp-buffer-size=4" one argument instead of two to fix another problem when passing compiler flags to CMAKE_REQUIRED_LIBRARIES, clang cannot deal with this and this breaks the build on mac. Enable libssp related flags for gcc only, because clang does not support them anyway. This fixes the build issue on mac.
2017-03-12 03:19:47 +00:00
# check if ssp flags are supported for this version of gcc
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(CMAKE_COMPILER_IS_GNUCXX)
disable gcc stack protector, segfault on 8.2.0 Make gcc -fstack-protector-strong and associated options controlled by the cmake option ENABLE_SSP which defaults to OFF. This option causes a segfault on startup with gcc 8.2.0.
2018-08-10 23:35:49 +00:00
if(ENABLE_SSP)
check_cxx_compiler_flag(-fstack-protector-strong F_STACK_PROTECTOR_STRONG_FLAG)
activate libssp compiler flags for gcc only In 82c8a1e3 I made "--param ssp-buffer-size=4" one argument instead of two to fix another problem when passing compiler flags to CMAKE_REQUIRED_LIBRARIES, clang cannot deal with this and this breaks the build on mac. Enable libssp related flags for gcc only, because clang does not support them anyway. This fixes the build issue on mac.
2017-03-12 03:19:47 +00:00
disable gcc stack protector, segfault on 8.2.0 Make gcc -fstack-protector-strong and associated options controlled by the cmake option ENABLE_SSP which defaults to OFF. This option causes a segfault on startup with gcc 8.2.0.
2018-08-10 23:35:49 +00:00
if(F_STACK_PROTECTOR_STRONG_FLAG)
set(MY_C_FLAGS ${MY_C_FLAGS} -fstack-protector-strong)
fix Debian 8 Jessie and Ubuntu 14 Trusty compat Fix some porting issues to make everything work on Debian 8 "Jessie" and Ubuntu 14 "Trusty": - set cmake minimum version to 2.8.12, this is the Ubuntu 14 version - combine C and C++ flags and add all of them using ADD_COMPILE_OPTIONS() without using generator expressions, which is a cmake 3.2 or so feature - add -fpermissive to force some non-const type casts to compile on older versions of gcc - add -std=c++11 for gcc to enable support on older versions of gcc - check that the compiler supports -fstack-protector-strong before adding it, older versions of gcc do not - fix the debian section of ./installdeps to include libpng-dev instead of libpng16-dev and add gettext for msginit etc. - fix compat checks in src/common/ffmpeg.cpp and src/wx/cmdevents.cpp to check for libavcodec >= 56 instead of > 56, the Debian Jessie version is exactly version 56 . With the one exception of AV_CODEC_FLAG_GLOBAL_HEADER which is defined in later versions.
2017-01-29 18:14:34 +00:00
disable gcc stack protector, segfault on 8.2.0 Make gcc -fstack-protector-strong and associated options controlled by the cmake option ENABLE_SSP which defaults to OFF. This option causes a segfault on startup with gcc 8.2.0.
2018-08-10 23:35:49 +00:00
check_cxx_compiler_flag("--param ssp-buffer-size=4" SSP_BUFFER_SIZE_FLAG)
fix Debian 8 Jessie and Ubuntu 14 Trusty compat Fix some porting issues to make everything work on Debian 8 "Jessie" and Ubuntu 14 "Trusty": - set cmake minimum version to 2.8.12, this is the Ubuntu 14 version - combine C and C++ flags and add all of them using ADD_COMPILE_OPTIONS() without using generator expressions, which is a cmake 3.2 or so feature - add -fpermissive to force some non-const type casts to compile on older versions of gcc - add -std=c++11 for gcc to enable support on older versions of gcc - check that the compiler supports -fstack-protector-strong before adding it, older versions of gcc do not - fix the debian section of ./installdeps to include libpng-dev instead of libpng16-dev and add gettext for msginit etc. - fix compat checks in src/common/ffmpeg.cpp and src/wx/cmdevents.cpp to check for libavcodec >= 56 instead of > 56, the Debian Jessie version is exactly version 56 . With the one exception of AV_CODEC_FLAG_GLOBAL_HEADER which is defined in later versions.
2017-01-29 18:14:34 +00:00
disable gcc stack protector, segfault on 8.2.0 Make gcc -fstack-protector-strong and associated options controlled by the cmake option ENABLE_SSP which defaults to OFF. This option causes a segfault on startup with gcc 8.2.0.
2018-08-10 23:35:49 +00:00
if(SSP_BUFFER_SIZE_FLAG)
# we do not add it to MY_C_FLAGS because this breaks things like CMAKE_REQUIRED_LIBRARIES
# which misinterpret compiler flags without leading dashes
add_compile_options(--param ssp-buffer-size=4)
endif()
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
endif()
endif()
fix Debian 8 Jessie and Ubuntu 14 Trusty compat Fix some porting issues to make everything work on Debian 8 "Jessie" and Ubuntu 14 "Trusty": - set cmake minimum version to 2.8.12, this is the Ubuntu 14 version - combine C and C++ flags and add all of them using ADD_COMPILE_OPTIONS() without using generator expressions, which is a cmake 3.2 or so feature - add -fpermissive to force some non-const type casts to compile on older versions of gcc - add -std=c++11 for gcc to enable support on older versions of gcc - check that the compiler supports -fstack-protector-strong before adding it, older versions of gcc do not - fix the debian section of ./installdeps to include libpng-dev instead of libpng16-dev and add gettext for msginit etc. - fix compat checks in src/common/ffmpeg.cpp and src/wx/cmdevents.cpp to check for libavcodec >= 56 instead of > 56, the Debian Jessie version is exactly version 56 . With the one exception of AV_CODEC_FLAG_GLOBAL_HEADER which is defined in later versions.
2017-01-29 18:14:34 +00:00
cmake: use color gcc/clang output when possible Test for the -fdiagnostics-color=auto compiler option supported by gcc and probably clang, and turn it on if it's available. This option colorizes compiler warnings/errors/etc. when output to a terminal. Also fix a typo above when adding the -fopenmp flag.
2019-01-30 22:29:06 +00:00
set(MY_C_FLAGS ${MY_C_FLAGS} -fopenmp)
endif()
cmake: gcc/clang colors with ninja, fix warnings Ninja requires `-fdiagnostics-color=always` instead of `-fdiagnostics-color=auto` with gcc because it pipes output from the compiler unlike regular makes. Use `-fcolor-diagnostics` for clang, which also works correctly with ninja to show colors. Information for this taken from here: https://medium.com/@alasher/colored-c-compiler-output-with-ninja-clang-gcc-10bfe7f2b949 Set all cmake policies in both the root `CMakeLists.txt` and `src/wx/CMakeLists.txt` to silence warnings about unset policies from cmake. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-26 00:35:23 +00:00
if(CMAKE_CXX_COMPILER_ID STREQUAL GNU)
unset(COMPILER_COLOR_DIAGNOSTICS)
check_cxx_compiler_flag(-fdiagnostics-color=always COMPILER_COLOR_DIAGNOSTICS)
if(COMPILER_COLOR_DIAGNOSTICS)
add_compile_options(-fdiagnostics-color=always)
else()
unset(COMPILER_COLOR_DIAGNOSTICS)
check_cxx_compiler_flag(-fdiagnostics-color COMPILER_COLOR_DIAGNOSTICS)
if(COMPILER_COLOR_DIAGNOSTICS)
add_compile_options(-fdiagnostics-color)
endif()
endif()
elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
unset(COMPILER_COLOR_DIAGNOSTICS)
check_cxx_compiler_flag(-fcolor-diagnostics COMPILER_COLOR_DIAGNOSTICS)
if(COMPILER_COLOR_DIAGNOSTICS)
add_compile_options(-fcolor-diagnostics)
endif()
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
endif()
compile/link flags improvements * Bump minimum cmake required to 3.3.2, to make sure generator expressions work. * Force CMAKE_BUILD_TYPE to "Release" if unset, not sure if this actually works. * Merge the older compile flags block with the new one and use generator expressions to make sure the relevant flags apply only to C, C++ or nasm. * Add -lssp to the end of the link commands for the -fstack-protector* options, this is only needed/done for gcc. * Add -lversion and -limm32 to SDL2_LIBRARY (Zach asked for this.) * Builds on msys2 again!
2016-11-20 19:11:52 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(MINGW)
set(MY_C_FLAGS ${MY_C_FLAGS} -static-libgcc -static-libstdc++)
endif()
wx 2.8 compat fixes, centos support, cmake fixes Add support for RHEL/centos to installdeps. There is no SFML package. Add some string compatibility stuff so that everything builds on wx 2.8 unicode builds. TODO: add travis slaves for 2.8, with and without unicode Disable the game frame spacer code on 2.8 because it does not work (the frame does not expand.) cmake improvements: - set ENABLE_LTO=OFF for Debug builds by default - set ENABLE_LINK=OFF if SFML cannot be found and continue - use better logic for finding wx utilities wx-config and wxrc Signed-off-by: Rafael Kitover <rkitover@gmail.com> Closes #395 Closes #297
2019-03-28 21:45:06 +00:00
if(CMAKE_BUILD_TYPE MATCHES Debug)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
set(MY_C_FLAGS ${MY_C_FLAGS} ${MY_C_DBG_FLAGS} -Wall -Wextra)
else()
set(MY_C_FLAGS ${MY_C_FLAGS} ${MY_C_OPT_FLAGS} -Wno-error)
endif()
compile/link flags improvements * Bump minimum cmake required to 3.3.2, to make sure generator expressions work. * Force CMAKE_BUILD_TYPE to "Release" if unset, not sure if this actually works. * Merge the older compile flags block with the new one and use generator expressions to make sure the relevant flags apply only to C, C++ or nasm. * Add -lssp to the end of the link commands for the -fstack-protector* options, this is only needed/done for gcc. * Add -lversion and -limm32 to SDL2_LIBRARY (Zach asked for this.) * Builds on msys2 again!
2016-11-20 19:11:52 +00:00
support FreeBSD Make some changes to support out-of-the-box builds on FreeBSD: - set cmake OpenGL type to `LEGACY`, the new `GLVND` type produces unusable binaries on FreeBSD - on FreeBSD add -I/usr/local/include to compiler flags, why this is necessary I don't know - look for llvm tools such as `llvm-ar` in `/usr/local/llvm-devel/bin`, LTO works - improve the `find_wx_util()` cmake function to handle `wx-config` scripts named in the form e.g. `wxgtk3u-3.1-config` - add FreeBSD support to `installdeps` - make some minor changes to included headers based on macros such as `__FreeBSD__` to compile on FreeBSD, including adding a `BSD.h` header with some defines for e.g. `fseeko64` - move the cmake X11 detection to before the wx compile tests, because otherwise the extra compile flags for the wx tests make the X11 tests fail - make some minor changes to fix wx 2.8 compatibilty again, we don't actually use 2.8 for FreeBSD but I was testing it Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-04-25 16:22:07 +00:00
# for some reason this is necessary
if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
set(MY_C_FLAGS -I/usr/local/include ${MY_C_FLAGS})
endif()
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
foreach(C_COMPILE_FLAG ${MY_C_FLAGS})
add_compile_options(${C_COMPILE_FLAG})
endforeach()
compile/link flags improvements * Bump minimum cmake required to 3.3.2, to make sure generator expressions work. * Force CMAKE_BUILD_TYPE to "Release" if unset, not sure if this actually works. * Merge the older compile flags block with the new one and use generator expressions to make sure the relevant flags apply only to C, C++ or nasm. * Add -lssp to the end of the link commands for the -fstack-protector* options, this is only needed/done for gcc. * Add -lversion and -limm32 to SDL2_LIBRARY (Zach asked for this.) * Builds on msys2 again!
2016-11-20 19:11:52 +00:00
build fixes: ffmpeg, xbrz, travis, C++ version Fix the cmake ffmpeg detection and make it not print the detection messages twice. Add `-D__STDC_FORMAT_MACROS` to compiler flags, some versions of ffmpeg require this. Redefine `static_assert(x)` to the `static_assert(x, msg)` form in `xbrz.cpp`. This is a C++17 feature and some versions of gcc wrongly set `__cpp_static_assert` even though they do not support it. Also we want to stick to C++11 for the time being, until there is consensus to support a newer a version. For that reason, change the MSVC flag `/std:c++latest` to `/std:c++11` as well. Remove `-DENABLE_OPENAL=ON` and `-DENABLE_LINK=ON` from travis config, as these are now automatic. In `installdeps` remove the hacks for supporting the `https://` apt url for mxe and use an `http://` url instead. This works perfectly on Ubuntu 14 (trusty). Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-08-31 22:58:59 +00:00
include(CheckCXXCompilerFlag)
remove -fpermissive compiler flag Remove -fpermissive from the list of flags passed to gcc and clang. Remove -fpermissive from the cxxflags from wxWidgets config as well. When checking wxWidgets ABI compatibility version, temporarily add -fpermissive to compiler flags on Win32 because minhook requires it.
2018-08-10 13:46:51 +00:00
set(MY_CXX_FLAGS -std=gnu++11 -fexceptions)
pass all compiler/linker flags for compile test When determining gcc/clang flags, save resulting C flags as MY_C_FLAGS, C++ flags as MY_CXX_FLAGS, and linker flags as MY_C_LINKER_FLAGS, then use them in the Wx OpenGL compile test. This fixes the test erroneously failing on git mxe on mac. Also, don't use -fPIC on Win32, set Wx defines separately from the test, and save all CMAKE_REQUIRED_* variables before the test and restore them afterwards.
2017-03-08 00:15:02 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
foreach(ARG ${MY_CXX_FLAGS})
set(MY_CXX_FLAGS_STR "${MY_CXX_FLAGS_STR} ${ARG}")
endforeach()
pass all compiler/linker flags for compile test When determining gcc/clang flags, save resulting C flags as MY_C_FLAGS, C++ flags as MY_CXX_FLAGS, and linker flags as MY_C_LINKER_FLAGS, then use them in the Wx OpenGL compile test. This fixes the test erroneously failing on git mxe on mac. Also, don't use -fPIC on Win32, set Wx defines separately from the test, and save all CMAKE_REQUIRED_* variables before the test and restore them afterwards.
2017-03-08 00:15:02 +00:00
use -fpermissive and -fexceptions with C++ only Add -fpermissive and -fexceptions to CMAKE_CXX_COMPILE_OBJECT so that they only affect C++. -std=gnu++11 was already there from b4ba9d9d, but this is a cleaner method (which is also used for NASM) where we use STRING(REGEX REPLACE ...) to append options after the <FLAGS> placeholder in CMAKE_CXX_COMPILE_OBJECT.
2017-02-12 12:41:57 +00:00
# These must be set for C++ only, and we can't use generator expressions in
# ADD_COMPILE_OPTIONS because that's a cmake 3.3 feature and we need 2.8.12
# compat for Ubuntu 14.
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
string(REGEX REPLACE "<FLAGS>" "<FLAGS> ${MY_CXX_FLAGS_STR} " CMAKE_CXX_COMPILE_OBJECT ${CMAKE_CXX_COMPILE_OBJECT})
pass all compile flags to link step This makes -static-libgcc -static-libstdc++ actually work, and is probably better for LTO as well.
2016-11-21 21:53:16 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
foreach(ARG ${MY_C_FLAGS})
set(MY_C_FLAGS_STR "${MY_C_FLAGS_STR} ${ARG}")
endforeach()
pass all compile flags to link step This makes -static-libgcc -static-libstdc++ actually work, and is probably better for LTO as well.
2016-11-21 21:53:16 +00:00
# need all flags for linking, because of -flto etc.
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
set(CMAKE_C_LINK_EXECUTABLE "${CMAKE_C_LINK_EXECUTABLE} ${MY_C_FLAGS_STR}")
set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} ${MY_C_FLAGS_STR}")
add LTO support, fix libssp link, add -ggdb3 -Og Add support for Link Time Optimization (LTO) on gcc and Clang. Link libssp only when it is on the system, some toolchains like Ubuntu's do not require explicitly linking to libssp. On Win32 try to link it statically. In debug builds with GCC, use -ggdb3 -Og, otherwise use -g . Two new cmake modules were written for this: * FindSSP.cmake -- this is for finding libssp on the system. * UseGCCBinUtilsWrappers.cmake -- this is for using gcc binutils wrappers such as gcc-ar, which is required for gcc LTO to work. These will be distributed separately as well.
2016-11-21 20:37:21 +00:00
compile/link flags improvements * Bump minimum cmake required to 3.3.2, to make sure generator expressions work. * Force CMAKE_BUILD_TYPE to "Release" if unset, not sure if this actually works. * Merge the older compile flags block with the new one and use generator expressions to make sure the relevant flags apply only to C, C++ or nasm. * Add -lssp to the end of the link commands for the -fstack-protector* options, this is only needed/done for gcc. * Add -lversion and -limm32 to SDL2_LIBRARY (Zach asked for this.) * Builds on msys2 again!
2016-11-20 19:11:52 +00:00
# for the gcc -fstack-protector* flags we need libssp
add LTO support, fix libssp link, add -ggdb3 -Og Add support for Link Time Optimization (LTO) on gcc and Clang. Link libssp only when it is on the system, some toolchains like Ubuntu's do not require explicitly linking to libssp. On Win32 try to link it statically. In debug builds with GCC, use -ggdb3 -Og, otherwise use -g . Two new cmake modules were written for this: * FindSSP.cmake -- this is for finding libssp on the system. * UseGCCBinUtilsWrappers.cmake -- this is for using gcc binutils wrappers such as gcc-ar, which is required for gcc LTO to work. These will be distributed separately as well.
2016-11-21 20:37:21 +00:00
# we also have to use the gcc- binutils for LTO to work
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(CMAKE_COMPILER_IS_GNUCXX)
if(ENABLE_LTO)
include(UseGCCBinUtilsWrappers)
endif()
add LTO support, fix libssp link, add -ggdb3 -Og Add support for Link Time Optimization (LTO) on gcc and Clang. Link libssp only when it is on the system, some toolchains like Ubuntu's do not require explicitly linking to libssp. On Win32 try to link it statically. In debug builds with GCC, use -ggdb3 -Og, otherwise use -g . Two new cmake modules were written for this: * FindSSP.cmake -- this is for finding libssp on the system. * UseGCCBinUtilsWrappers.cmake -- this is for using gcc binutils wrappers such as gcc-ar, which is required for gcc LTO to work. These will be distributed separately as well.
2016-11-21 20:37:21 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
set(MY_C_LINKER_FLAGS ${MY_C_LINKER_FLAGS} -Wl,-allow-multiple-definition)
if(CMAKE_PREFIX_PATH)
list(GET CMAKE_PREFIX_PATH 0 prefix_path_first)
set(MY_C_LINKER_FLAGS ${MY_C_LINKER_FLAGS} "-Wl,-rpath-link=${prefix_path_first}/lib")
endif()
endif()
pass all compiler/linker flags for compile test When determining gcc/clang flags, save resulting C flags as MY_C_FLAGS, C++ flags as MY_CXX_FLAGS, and linker flags as MY_C_LINKER_FLAGS, then use them in the Wx OpenGL compile test. This fixes the test erroneously failing on git mxe on mac. Also, don't use -fPIC on Win32, set Wx defines separately from the test, and save all CMAKE_REQUIRED_* variables before the test and restore them afterwards.
2017-03-08 00:15:02 +00:00
# set linker flags
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
foreach(ARG ${MY_C_LINKER_FLAGS})
set(MY_C_LINKER_FLAGS_STR "${MY_C_LINKER_FLAGS_STR} ${ARG}")
endforeach()
pass all compiler/linker flags for compile test When determining gcc/clang flags, save resulting C flags as MY_C_FLAGS, C++ flags as MY_CXX_FLAGS, and linker flags as MY_C_LINKER_FLAGS, then use them in the Wx OpenGL compile test. This fixes the test erroneously failing on git mxe on mac. Also, don't use -fPIC on Win32, set Wx defines separately from the test, and save all CMAKE_REQUIRED_* variables before the test and restore them afterwards.
2017-03-08 00:15:02 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
set(CMAKE_C_LINK_EXECUTABLE "${CMAKE_C_LINK_EXECUTABLE} ${MY_C_LINKER_FLAGS_STR}")
set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} ${MY_C_LINKER_FLAGS_STR}")
/std:c++latest for MSVC, fix bool flip, warn opts Use `/std:c++latest` for Visual Studio because the XBRZ 1.7 code requires at least C++17. Replace the use of `bool++` in `GBALink.cpp` which is now apparently an error with `bool = !bool` to flip the value. Use `/W4` to enable a good amount of warnings in Debug mode, and `/W0` to disable warnings entirely in release modes. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-08-30 01:57:01 +00:00
elseif(MSVC)
cmake: Visual Studio support improvements. Add support for vcpkg ffmpeg, this requires using someone's FindFFmpeg.cmake instead of relying on pkg-config, since vcpkg does not have pkg-config. Do not use the ffmpeg from vcpkg on appveyor however, because that pushes the build cache generation over the time limit for jobs. Add secur32 and bcrypt to the list of ffmpeg libs on windows, these are standard windows libraries. Change some code in ffmpeg.cpp to remove C-style casts of struct initializers, which are illegal in MSVC. Add the INT64_C and UINT64_C macros missing in MSVC's stdint.h (if not defined) to ffmpeg.h before the ffmpeg headers are included, because they rely on them. Rewrite the wxWidgets finding code for the vcpkg wxWidgets to be nicer and work correctly for debug and static builds. Remove all /W* and /w* warnings options from cmake compiler flags, and replace them with /W4 for debug builds, and /w (no warnings) for release modes. When building a static binary, remove all /MD* flags from cmake compiler flags, and use /MT for static release builds and /MTd for static debug builds. Improve the vcpkg toolchain wrapper to only rebuild the vcpkg binary if there were git updates. Redo the handling of SDL2 and SDL_main. Only link SDL2Main to the SDL binary and don't use the definitions. Update CMakeSettings.json to use Ninja and include static configurations. Use CMAKE_PROJECT_DIR instead of CMAKE_SOURCE_DIR to determine the vcpkg root, as CMAKE_SOURCE_DIR is sometimes set incorrectly in the 2017 GUI. Add /nodefaultlib:libcmt to the debug build link flags, as in debug builds libcmtd is used and libcmt should not be. Add /subsystem:console to debug build link flags to produce a windows console app for debug builds, like we do for mingw builds. To do this, define a WIN32_CONSOLE_APP macro and if set, define a main() that calls WinMain(). Call wxMesdsageOutput::Set() in OnInit with an instance of wxMessageOutputStderr for windows debug builds to make sure the --help text etc. goes to the console instead of a popup box. Update the Visual Studio related text in README.md. Fix dynamic debug builds by linking to the debug version of SDL2 and copying the debug version of the dll to the build dir. Fix issue in MainFrame::BindAppIcon with the function we are using not being found in a Windows DLL in debug builds by using wxDynamicLibrary::GetSymboolAorW() instead of GetSymbol(). Enable LTO for MSVC in Release modes, if the option is set. Change appveyor config to use an 8 item build matrix of x64/x86 / Release/Debug / Static/Dynamic. And test the binary in debug modes by running --help. When copying the wxrc.exe out of the build tree, copy both the release and debug versions, this is so that appveyor caching of vcpkg works, since the build trees are not cached. Add some necessary win32 libraries to the SDL binary. And enable building it on appveyor. Fix #465. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-10 11:13:58 +00:00
# first remove all warnings flags, otherwise there is a warning about overriding them
string(REGEX REPLACE "/[Ww][^ ]+" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
string(REGEX REPLACE "/[Ww][^ ]+" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
/std:c++latest for MSVC, fix bool flip, warn opts Use `/std:c++latest` for Visual Studio because the XBRZ 1.7 code requires at least C++17. Replace the use of `bool++` in `GBALink.cpp` which is now apparently an error with `bool = !bool` to flip the value. Use `/W4` to enable a good amount of warnings in Debug mode, and `/W0` to disable warnings entirely in release modes. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-08-30 01:57:01 +00:00
if(CMAKE_BUILD_TYPE STREQUAL Debug)
add_compile_options(/W4)
else()
cmake: Visual Studio support improvements. Add support for vcpkg ffmpeg, this requires using someone's FindFFmpeg.cmake instead of relying on pkg-config, since vcpkg does not have pkg-config. Do not use the ffmpeg from vcpkg on appveyor however, because that pushes the build cache generation over the time limit for jobs. Add secur32 and bcrypt to the list of ffmpeg libs on windows, these are standard windows libraries. Change some code in ffmpeg.cpp to remove C-style casts of struct initializers, which are illegal in MSVC. Add the INT64_C and UINT64_C macros missing in MSVC's stdint.h (if not defined) to ffmpeg.h before the ffmpeg headers are included, because they rely on them. Rewrite the wxWidgets finding code for the vcpkg wxWidgets to be nicer and work correctly for debug and static builds. Remove all /W* and /w* warnings options from cmake compiler flags, and replace them with /W4 for debug builds, and /w (no warnings) for release modes. When building a static binary, remove all /MD* flags from cmake compiler flags, and use /MT for static release builds and /MTd for static debug builds. Improve the vcpkg toolchain wrapper to only rebuild the vcpkg binary if there were git updates. Redo the handling of SDL2 and SDL_main. Only link SDL2Main to the SDL binary and don't use the definitions. Update CMakeSettings.json to use Ninja and include static configurations. Use CMAKE_PROJECT_DIR instead of CMAKE_SOURCE_DIR to determine the vcpkg root, as CMAKE_SOURCE_DIR is sometimes set incorrectly in the 2017 GUI. Add /nodefaultlib:libcmt to the debug build link flags, as in debug builds libcmtd is used and libcmt should not be. Add /subsystem:console to debug build link flags to produce a windows console app for debug builds, like we do for mingw builds. To do this, define a WIN32_CONSOLE_APP macro and if set, define a main() that calls WinMain(). Call wxMesdsageOutput::Set() in OnInit with an instance of wxMessageOutputStderr for windows debug builds to make sure the --help text etc. goes to the console instead of a popup box. Update the Visual Studio related text in README.md. Fix dynamic debug builds by linking to the debug version of SDL2 and copying the debug version of the dll to the build dir. Fix issue in MainFrame::BindAppIcon with the function we are using not being found in a Windows DLL in debug builds by using wxDynamicLibrary::GetSymboolAorW() instead of GetSymbol(). Enable LTO for MSVC in Release modes, if the option is set. Change appveyor config to use an 8 item build matrix of x64/x86 / Release/Debug / Static/Dynamic. And test the binary in debug modes by running --help. When copying the wxrc.exe out of the build tree, copy both the release and debug versions, this is so that appveyor caching of vcpkg works, since the build trees are not cached. Add some necessary win32 libraries to the SDL binary. And enable building it on appveyor. Fix #465. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-10 11:13:58 +00:00
add_compile_options(/w)
if(ENABLE_LTO)
add_compile_options(/GL)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LTCG")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /LTCG")
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /LTCG")
set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /LTCG")
endif()
endif()
if(VBAM_STATIC)
string(REGEX REPLACE "/MDd?" "" CMAKE_C_FLAGS ${CMAKE_CXX_FLAGS})
string(REGEX REPLACE "/MDd?" "" CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_CXX_FLAGS})
string(REGEX REPLACE "/MDd?" "" CMAKE_C_FLAGS_RELEASE ${CMAKE_CXX_FLAGS})
string(REGEX REPLACE "/MDd?" "" CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS})
string(REGEX REPLACE "/MDd?" "" CMAKE_C_FLAGS_DEBUG ${CMAKE_CXX_FLAGS})
string(REGEX REPLACE "/MDd?" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
string(REGEX REPLACE "/MDd?" "" CMAKE_CXX_FLAGS_MINSIZEREL ${CMAKE_CXX_FLAGS})
string(REGEX REPLACE "/MDd?" "" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS})
string(REGEX REPLACE "/MDd?" "" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS})
string(REGEX REPLACE "/MDd?" "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS})
if(CMAKE_BUILD_TYPE MATCHES "Debug|RelWithDebInfo")
add_compile_options(/MTd)
else()
add_compile_options(/MT)
endif()
/std:c++latest for MSVC, fix bool flip, warn opts Use `/std:c++latest` for Visual Studio because the XBRZ 1.7 code requires at least C++17. Replace the use of `bool++` in `GBALink.cpp` which is now apparently an error with `bool = !bool` to flip the value. Use `/W4` to enable a good amount of warnings in Debug mode, and `/W0` to disable warnings entirely in release modes. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-08-30 01:57:01 +00:00
endif()
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
endif()
CMAKE: Do not override system C/C++ compiler flags when no build type is defined. This will make things easiers for packaging.
2011-02-26 12:11:06 +00:00
compile/link flags improvements * Bump minimum cmake required to 3.3.2, to make sure generator expressions work. * Force CMAKE_BUILD_TYPE to "Release" if unset, not sure if this actually works. * Merge the older compile flags block with the new one and use generator expressions to make sure the relevant flags apply only to C, C++ or nasm. * Add -lssp to the end of the link commands for the -fstack-protector* options, this is only needed/done for gcc. * Add -lversion and -limm32 to SDL2_LIBRARY (Zach asked for this.) * Builds on msys2 again!
2016-11-20 19:11:52 +00:00
# Assembler flags
Fixing file.
2008-06-06 10:17:20 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(ASM_ENABLED)
string(REGEX REPLACE "<FLAGS>" "-I${CMAKE_SOURCE_DIR}/src/filters/hq/asm/ -O1 -w-orphan-labels" CMAKE_ASM_NASM_COMPILE_OBJECT ${CMAKE_ASM_NASM_COMPILE_OBJECT})
endif()
compile/link flags improvements * Bump minimum cmake required to 3.3.2, to make sure generator expressions work. * Force CMAKE_BUILD_TYPE to "Release" if unset, not sure if this actually works. * Merge the older compile flags block with the new one and use generator expressions to make sure the relevant flags apply only to C, C++ or nasm. * Add -lssp to the end of the link commands for the -fstack-protector* options, this is only needed/done for gcc. * Add -lversion and -limm32 to SDL2_LIBRARY (Zach asked for this.) * Builds on msys2 again!
2016-11-20 19:11:52 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(APPLE)
add_definitions(-DMACHO)
elseif("${CMAKE_SYSTEM}" MATCHES "Linux")
add_definitions(-DELF)
endif()
try and get mingw to force static gcc and libc++
2015-05-18 03:04:34 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(AMD64)
add_definitions(-D__AMD64__)
endif()
try and get mingw to force static gcc and libc++
2015-05-18 03:04:34 +00:00
cmakelists changes, wxwidgets interface build fix to follow.
2015-03-27 17:48:42 +00:00
add_subdirectory (fex)
fix the cmake/linux build moves dependencies/File_Extractor-1.0.0 to trunk/fex - we can't expect people to have this lib, and fex has dropped support for the "fex_mini".
2010-03-15 03:36:45 +00:00
cmake: refactor, better clang support Do some reformatting towards the more modern cmake style. Clean up some code. Support linking to gcc compiled wxWidgets by setting `-D__GXX_ABI_VERSION=` appropriately for clang. Use the new method of calling `FindwxWidgets.cmake`, the old method causes some problems now. Set all necessary policies in both cmake files. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-27 03:25:43 +00:00
set(
SRC_MAIN
Fixing file.
2008-06-06 10:17:20 +00:00
src/Util.cpp
Created a common configuration system.
2015-04-18 06:53:55 +00:00
src/common/ConfigManager.cpp
src/common/dictionary.c
src/common/iniparser.c
Moved some files to the common folder.
2009-01-01 14:21:18 +00:00
src/common/Patch.cpp
src/common/memgzio.c
sdl patched
2011-05-24 07:49:00 +00:00
src/common/SoundSDL.cpp
Fixing file.
2008-06-06 10:17:20 +00:00
)
Some fixes for MSVC.
2017-02-11 02:57:35 +00:00
if(MSVC)
Fix video/audio recording. We create a namespace to deal with most of our recording solution. Besides that, we also add some functions to remove the need of including libavutil headers on other part of the code. This is meant to isolate most of recording solution components on the proper files. We will start with a limited number of codecs supported; slowly we should add them as they are tested (the previous one did not work for most codecs listed). This should support `ffmpeg 4.1` and further, including removing all compilation warnings related to versions discrepancy.
2019-07-22 18:10:53 +00:00
set(SRC_MAIN ${SRC_MAIN} "dependencies/msvc/getopt.c")
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
endif()
Some fixes for MSVC.
2017-02-11 02:57:35 +00:00
cmake: refactor, better clang support Do some reformatting towards the more modern cmake style. Clean up some code. Support linking to gcc compiled wxWidgets by setting `-D__GXX_ABI_VERSION=` appropriately for clang. Use the new method of calling `FindwxWidgets.cmake`, the old method causes some problems now. Set all necessary policies in both cmake files. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-27 03:25:43 +00:00
set(
HDR_MAIN
Add some header and resource files to CMakeLists.txts (Core+WX) This makes these files show up in generated CodeBlocks projects, which makes life easier for folks who import into QtCreator.
2016-06-07 20:26:53 +00:00
src/System.h
src/Util.h
src/common/array.h
src/common/ConfigManager.h
src/common/dictionary.h
src/common/iniparser.h
src/common/memgzio.h
src/common/Port.h
src/common/SoundDriver.h
src/common/SoundSDL.h
)
Some fixes for MSVC.
2017-02-11 02:57:35 +00:00
if(MSVC)
Fix video/audio recording. We create a namespace to deal with most of our recording solution. Besides that, we also add some functions to remove the need of including libavutil headers on other part of the code. This is meant to isolate most of recording solution components on the proper files. We will start with a limited number of codecs supported; slowly we should add them as they are tested (the previous one did not work for most codecs listed). This should support `ffmpeg 4.1` and further, including removing all compilation warnings related to versions discrepancy.
2019-07-22 18:10:53 +00:00
set(HDR_MAIN ${HDR_MAIN} "dependencies/msvc/getopt.h")
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
endif()
Some fixes for MSVC.
2017-02-11 02:57:35 +00:00
buncha patches by darktjm sdl fix not applied yet
2011-05-24 07:39:29 +00:00
if(ENABLE_FFMPEG)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
set(SRC_MAIN ${SRC_MAIN} src/common/ffmpeg.cpp)
set(HDR_MAIN ${HDR_MAIN} src/common/ffmpeg.h)
endif()
buncha patches by darktjm sdl fix not applied yet
2011-05-24 07:39:29 +00:00
Add some header and resource files to CMakeLists.txts (Core+WX) This makes these files show up in generated CodeBlocks projects, which makes life easier for folks who import into QtCreator.
2016-06-07 20:26:53 +00:00
if(ENABLE_NLS)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
set(HDR_MAIN ${HDR_MAIN} src/NLS.h)
endif()
Add some header and resource files to CMakeLists.txts (Core+WX) This makes these files show up in generated CodeBlocks projects, which makes life easier for folks who import into QtCreator.
2016-06-07 20:26:53 +00:00
cmake: refactor, better clang support Do some reformatting towards the more modern cmake style. Clean up some code. Support linking to gcc compiled wxWidgets by setting `-D__GXX_ABI_VERSION=` appropriately for clang. Use the new method of calling `FindwxWidgets.cmake`, the old method causes some problems now. Set all necessary policies in both cmake files. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-27 03:25:43 +00:00
set(
SRC_GBA
No more cryptic names ...
2009-01-01 15:20:03 +00:00
src/gba/agbprint.cpp
Moved more GBA specific code to the gba folder.
2009-01-01 16:11:02 +00:00
src/gba/bios.cpp
src/gba/Cheats.cpp
sdl patched
2011-05-24 07:49:00 +00:00
src/gba/CheatSearch.cpp
Integrated the VBA-SDL-H2 code into the GDB function. This allows breakpoints, memory views and watches to be controlled from the GDB interface. The VBA-SDL-H2 commands can be entered via the GDB monitor (type "help" into the monitor for a list of commands). Made minor changes to the GDB interface so that the GDB port does not need to be entered every session. A "Break on Load" option has been added allowing GDB to be connected before the ROM starts executing. VBA-SDL-H2 credits: Labmaster, kenobi, DevZ, richq, JPAN, Griever
2015-04-02 05:53:57 +00:00
src/gba/debugger-expr-lex.cpp
src/gba/debugger-expr-yacc.cpp
Moved more GBA specific code to the gba folder.
2009-01-01 16:11:02 +00:00
src/gba/EEprom.cpp
Added E-Reader scan support by CaitSith2. One thing it does, is correct any raw files scanned, if they are correctable. (usually, uncorrectable raw files come up with a read error.) There is also bin support included as well. (Note, if you open a valid dotcode bin, it will encode it to raw, and save the freshly encoded raw file if it has been set in the menu. If the dotcode save file has not been set, the bin will still load.) Currently, part of the GBA emulation breaks the E-Reader scan code. The reader always returns a Region Error.
2015-03-27 22:50:11 +00:00
src/gba/ereader.cpp
Moved more GBA specific code to the gba folder.
2009-01-01 16:11:02 +00:00
src/gba/Flash.cpp
No more cryptic names ...
2009-01-01 15:20:03 +00:00
src/gba/GBA.cpp
src/gba/GBAGfx.cpp
fix the cmake/linux build moves dependencies/File_Extractor-1.0.0 to trunk/fex - we can't expect people to have this lib, and fex has dropped support for the "fex_mini".
2010-03-15 03:36:45 +00:00
src/gba/GBALink.cpp
src/gba/GBASockClient.cpp
No more cryptic names ...
2009-01-01 15:20:03 +00:00
src/gba/GBA-thumb.cpp
src/gba/GBA-arm.cpp
GTK+ / SDL : fixed build
2009-10-09 14:47:41 +00:00
src/gba/gbafilter.cpp
Moved more GBA specific code to the gba folder.
2009-01-01 16:11:02 +00:00
src/gba/Globals.cpp
src/gba/Mode0.cpp
src/gba/Mode1.cpp
src/gba/Mode2.cpp
src/gba/Mode3.cpp
src/gba/Mode4.cpp
src/gba/Mode5.cpp
src/gba/RTC.cpp
src/gba/Sound.cpp
src/gba/Sram.cpp
Fixing file.
2008-06-06 10:17:20 +00:00
)
Fix compilation issue when `ENABLE_DEBUGGER=Off`. We protect all code relevant to disabling this property with either `BKPT_SUPPORT` or `NO_DEBUGGER`. This is mostly debugging options or prints scattered around the code. We also adjust cmake to ignore the specific files surround it, but allowing the rest of the GUI to work. - Fix #431.
2019-05-30 11:50:45 +00:00
if(ENABLE_DEBUGGER)
list(APPEND SRC_GBA
src/gba/BreakpointStructures.cpp
)
endif()
cmake: refactor, better clang support Do some reformatting towards the more modern cmake style. Clean up some code. Support linking to gcc compiled wxWidgets by setting `-D__GXX_ABI_VERSION=` appropriately for clang. Use the new method of calling `FindwxWidgets.cmake`, the old method causes some problems now. Set all necessary policies in both cmake files. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-27 03:25:43 +00:00
set(
HDR_GBA
Add some header and resource files to CMakeLists.txts (Core+WX) This makes these files show up in generated CodeBlocks projects, which makes life easier for folks who import into QtCreator.
2016-06-07 20:26:53 +00:00
src/gba/agbprint.h
src/gba/bios.h
src/gba/BreakpointStructures.h
src/gba/Cheats.h
src/gba/CheatSearch.h
src/gba/debugger-expr-yacc.hpp
src/gba/EEprom.h
src/gba/ereader.h
src/gba/Flash.h
src/gba/GBA.h
src/gba/GBAcpu.h
src/gba/gbafilter.h
src/gba/GBAGfx.h
src/gba/GBAinline.h
src/gba/GBALink.h
src/gba/GBASockClient.h
src/gba/Globals.h
src/gba/RTC.h
src/gba/Sound.h
src/gba/Sram.h
)
cmake: refactor, better clang support Do some reformatting towards the more modern cmake style. Clean up some code. Support linking to gcc compiled wxWidgets by setting `-D__GXX_ABI_VERSION=` appropriately for clang. Use the new method of calling `FindwxWidgets.cmake`, the old method causes some problems now. Set all necessary policies in both cmake files. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-27 03:25:43 +00:00
set(
SRC_GB
No need to use cryptic names
2009-01-01 14:52:03 +00:00
src/gb/GB.cpp
src/gb/gbCheats.cpp
src/gb/gbDis.cpp
src/gb/gbGfx.cpp
src/gb/gbGlobals.cpp
src/gb/gbMemory.cpp
src/gb/gbPrinter.cpp
src/gb/gbSGB.cpp
src/gb/gbSound.cpp
Moved the APU files up by one level, since they are shared between the GB and GBA cores.
2009-01-01 14:43:18 +00:00
)
cmake: refactor, better clang support Do some reformatting towards the more modern cmake style. Clean up some code. Support linking to gcc compiled wxWidgets by setting `-D__GXX_ABI_VERSION=` appropriately for clang. Use the new method of calling `FindwxWidgets.cmake`, the old method causes some problems now. Set all necessary policies in both cmake files. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-27 03:25:43 +00:00
set(
HDR_GB
Add some header and resource files to CMakeLists.txts (Core+WX) This makes these files show up in generated CodeBlocks projects, which makes life easier for folks who import into QtCreator.
2016-06-07 20:26:53 +00:00
src/gb/gb.h
src/gb/gbCheats.h
src/gb/gbCodes.h
src/gb/gbCodesCB.h
src/gb/gbGlobals.h
src/gb/gbMemory.h
src/gb/gbPrinter.h
src/gb/gbSGB.h
src/gb/gbSound.h
)
cmake: refactor, better clang support Do some reformatting towards the more modern cmake style. Clean up some code. Support linking to gcc compiled wxWidgets by setting `-D__GXX_ABI_VERSION=` appropriately for clang. Use the new method of calling `FindwxWidgets.cmake`, the old method causes some problems now. Set all necessary policies in both cmake files. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-27 03:25:43 +00:00
set(
SRC_APU
Moved the APU files up by one level, since they are shared between the GB and GBA cores.
2009-01-01 14:43:18 +00:00
src/apu/Blip_Buffer.cpp
src/apu/Effects_Buffer.cpp
src/apu/Gb_Apu.cpp
src/apu/Gb_Apu_State.cpp
src/apu/Gb_Oscs.cpp
src/apu/Multi_Buffer.cpp
Fixing file.
2008-06-06 10:17:20 +00:00
)
cmake: refactor, better clang support Do some reformatting towards the more modern cmake style. Clean up some code. Support linking to gcc compiled wxWidgets by setting `-D__GXX_ABI_VERSION=` appropriately for clang. Use the new method of calling `FindwxWidgets.cmake`, the old method causes some problems now. Set all necessary policies in both cmake files. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-27 03:25:43 +00:00
set(
HDR_APU
Add some header and resource files to CMakeLists.txts (Core+WX) This makes these files show up in generated CodeBlocks projects, which makes life easier for folks who import into QtCreator.
2016-06-07 20:26:53 +00:00
src/apu/blargg_common.h #Unused(?) but in the VS projects
src/apu/blargg_config.h #Unused(?) but in the VS projects
src/apu/blargg_source.h
src/apu/Blip_Buffer.h
src/apu/Effects_Buffer.h
src/apu/Gb_Apu.h
src/apu/Gb_Oscs.h
src/apu/Multi_Buffer.h
)
cmake: refactor, better clang support Do some reformatting towards the more modern cmake style. Clean up some code. Support linking to gcc compiled wxWidgets by setting `-D__GXX_ABI_VERSION=` appropriately for clang. Use the new method of calling `FindwxWidgets.cmake`, the old method causes some problems now. Set all necessary policies in both cmake files. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-27 03:25:43 +00:00
set(
SRC_SDL
Fixing file.
2008-06-06 10:17:20 +00:00
src/sdl/SDL.cpp
src/sdl/filters.cpp
src/sdl/text.cpp
SDL: Started factoring out the input code to a new file. Only moved code at this point. The ultimate goal is to reuse this code for the GTK port.
2008-08-30 17:50:51 +00:00
src/sdl/inputSDL.cpp
SDL: - The expression parser/lexer is SDL specific, moved it to the sdl folder - Readded the flex/bison source files from VBA's CVS - Rebuilt the parser/lexer from source
2008-08-29 10:23:51 +00:00
src/sdl/expr.cpp
src/sdl/exprNode.cpp
src/sdl/expr-lex.cpp
fix Visual Studio build The change to use an extern version variable in 24d83a12 produces a linker error with Visual Studio due to the `version.c` source file being compiled as C instead of C++. Rename: `version.c` -> `version.cpp` `version_c.h` -> `version_cpp.h` And update all references accordingly. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-10-04 13:20:10 +00:00
src/common/version.cpp
Fixing file.
2008-06-06 10:17:20 +00:00
)
cmake: refactor, better clang support Do some reformatting towards the more modern cmake style. Clean up some code. Support linking to gcc compiled wxWidgets by setting `-D__GXX_ABI_VERSION=` appropriately for clang. Use the new method of calling `FindwxWidgets.cmake`, the old method causes some problems now. Set all necessary policies in both cmake files. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-27 03:25:43 +00:00
set(
HDR_SDL
Add some header and resource files to CMakeLists.txts (Core+WX) This makes these files show up in generated CodeBlocks projects, which makes life easier for folks who import into QtCreator.
2016-06-07 20:26:53 +00:00
src/sdl/filters.h
src/sdl/text.h
src/sdl/inputSDL.h
src/sdl/expr.cpp.h
src/sdl/exprNode.h
fix Visual Studio build The change to use an extern version variable in 24d83a12 produces a linker error with Visual Studio due to the `version.c` source file being compiled as C instead of C++. Rename: `version.c` -> `version.cpp` `version_c.h` -> `version_cpp.h` And update all references accordingly. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-10-04 13:20:10 +00:00
src/common/version_cpp.h
Add some header and resource files to CMakeLists.txts (Core+WX) This makes these files show up in generated CodeBlocks projects, which makes life easier for folks who import into QtCreator.
2016-06-07 20:26:53 +00:00
)
cmake: refactor, better clang support Do some reformatting towards the more modern cmake style. Clean up some code. Support linking to gcc compiled wxWidgets by setting `-D__GXX_ABI_VERSION=` appropriately for clang. Use the new method of calling `FindwxWidgets.cmake`, the old method causes some problems now. Set all necessary policies in both cmake files. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-27 03:25:43 +00:00
set(
SRC_FILTERS
Moved the filters to their own directory.
2009-01-01 13:02:35 +00:00
src/filters/2xSaI.cpp
src/filters/admame.cpp
src/filters/bilinear.cpp
src/filters/hq2x.cpp
src/filters/interframe.cpp
src/filters/pixel.cpp
src/filters/scanline.cpp
all current vba-m Wx patches applied to trunk.
2011-05-25 11:55:46 +00:00
src/filters/simpleFilter.cpp
XBRZ 1.2 added as a built in filter
2015-03-19 01:44:47 +00:00
src/filters/xbrzfilter.cpp
src/filters/xBRZ/xbrz.cpp
Moved the filters to their own directory.
2009-01-01 13:02:35 +00:00
)
cmake: refactor, better clang support Do some reformatting towards the more modern cmake style. Clean up some code. Support linking to gcc compiled wxWidgets by setting `-D__GXX_ABI_VERSION=` appropriately for clang. Use the new method of calling `FindwxWidgets.cmake`, the old method causes some problems now. Set all necessary policies in both cmake files. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-27 03:25:43 +00:00
set(
HDR_FILTERS
Add some header and resource files to CMakeLists.txts (Core+WX) This makes these files show up in generated CodeBlocks projects, which makes life easier for folks who import into QtCreator.
2016-06-07 20:26:53 +00:00
src/filters/hq2x.h
src/filters/interp.h
src/filters/lq2x.h
Update to xBRZ `1.7`. Get files from here `https://sourceforge.net/projects/xbrz/files/xBRZ/`. Then, update the src to handle pitch params. For our case, the pitch is necessary because we deal with borders (top and right) of our source image. Normally, we would want to scale without it, and therefore we need to adjust the pointers to skip the borders. If we have a `width + 1 pixel border` per line, the we need to scale a image with `width` line size, but advancing the pointer for each new line processed including the border on the count. Also, since our output pointer also allocates for the border, we need to adjust the output moving pointer for each line in a custom way. (output border in this case) - Fix #164.
2019-08-22 16:55:06 +00:00
src/filters/xBRZ/xbrz_config.h
Add some header and resource files to CMakeLists.txts (Core+WX) This makes these files show up in generated CodeBlocks projects, which makes life easier for folks who import into QtCreator.
2016-06-07 20:26:53 +00:00
src/filters/xBRZ/xbrz.h
Update to xBRZ `1.7`. Get files from here `https://sourceforge.net/projects/xbrz/files/xBRZ/`. Then, update the src to handle pitch params. For our case, the pitch is necessary because we deal with borders (top and right) of our source image. Normally, we would want to scale without it, and therefore we need to adjust the pointers to skip the borders. If we have a `width + 1 pixel border` per line, the we need to scale a image with `width` line size, but advancing the pointer for each new line processed including the border on the count. Also, since our output pointer also allocates for the border, we need to adjust the output moving pointer for each line in a custom way. (output border in this case) - Fix #164.
2019-08-22 16:55:06 +00:00
src/filters/xBRZ/xbrz_tools.h
Add some header and resource files to CMakeLists.txts (Core+WX) This makes these files show up in generated CodeBlocks projects, which makes life easier for folks who import into QtCreator.
2016-06-07 20:26:53 +00:00
)
cmake: refactor, better clang support Do some reformatting towards the more modern cmake style. Clean up some code. Support linking to gcc compiled wxWidgets by setting `-D__GXX_ABI_VERSION=` appropriately for clang. Use the new method of calling `FindwxWidgets.cmake`, the old method causes some problems now. Set all necessary policies in both cmake files. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-27 03:25:43 +00:00
set(
SRC_HQ_C
Moved the filters to their own directory.
2009-01-01 13:02:35 +00:00
src/filters/hq/c/hq_implementation.cpp
Fixing file.
2008-06-06 10:17:20 +00:00
)
cmake: refactor, better clang support Do some reformatting towards the more modern cmake style. Clean up some code. Support linking to gcc compiled wxWidgets by setting `-D__GXX_ABI_VERSION=` appropriately for clang. Use the new method of calling `FindwxWidgets.cmake`, the old method causes some problems now. Set all necessary policies in both cmake files. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-27 03:25:43 +00:00
set(
HDR_HQ_C
Add some header and resource files to CMakeLists.txts (Core+WX) This makes these files show up in generated CodeBlocks projects, which makes life easier for folks who import into QtCreator.
2016-06-07 20:26:53 +00:00
src/filters/hq/c/hq3x_pattern.h
src/filters/hq/c/hq4x_pattern.h
src/filters/hq/c/hq_base.h
src/filters/hq/c/hq_shared.h
)
cmake: refactor, better clang support Do some reformatting towards the more modern cmake style. Clean up some code. Support linking to gcc compiled wxWidgets by setting `-D__GXX_ABI_VERSION=` appropriately for clang. Use the new method of calling `FindwxWidgets.cmake`, the old method causes some problems now. Set all necessary policies in both cmake files. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-27 03:25:43 +00:00
set(
SRC_HQ_ASM
Moved the filters to their own directory.
2009-01-01 13:02:35 +00:00
src/filters/hq/asm/hq3x_16.asm
src/filters/hq/asm/hq3x_32.asm
src/filters/hq/asm/hq4x_16.asm
src/filters/hq/asm/hq4x_32.asm
src/filters/hq/asm/hq3x32.cpp
Fixing file.
2008-06-06 10:17:20 +00:00
)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(ENABLE_ASM_SCALERS)
set(SRC_FILTERS ${SRC_FILTERS} ${SRC_HQ_ASM})
if(ENABLE_MMX)
set(SRC_FILTERS ${SRC_FILTERS} src/filters/2xSaImmx.asm)
endif()
else()
set(SRC_FILTERS ${SRC_FILTERS} ${SRC_HQ_C})
set(HDR_FILTERS ${HDR_FILTERS} ${HDR_HQ_C})
add_definitions(-DNO_ASM)
endif()
Fix compilation issue when `ENABLE_DEBUGGER=Off`. We protect all code relevant to disabling this property with either `BKPT_SUPPORT` or `NO_DEBUGGER`. This is mostly debugging options or prints scattered around the code. We also adjust cmake to ignore the specific files surround it, but allowing the rest of the GUI to work. - Fix #431.
2019-05-30 11:50:45 +00:00
set(
SRC_DEBUGGER
src/gba/armdis.cpp
src/gba/elf.cpp
)
set(
HDR_DEBUGGER
src/gba/armdis.h
src/gba/elf.h
)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(ENABLE_DEBUGGER)
cmake: refactor, better clang support Do some reformatting towards the more modern cmake style. Clean up some code. Support linking to gcc compiled wxWidgets by setting `-D__GXX_ABI_VERSION=` appropriately for clang. Use the new method of calling `FindwxWidgets.cmake`, the old method causes some problems now. Set all necessary policies in both cmake files. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-27 03:25:43 +00:00
set(
SRC_DEBUGGER
Fix compilation issue when `ENABLE_DEBUGGER=Off`. We protect all code relevant to disabling this property with either `BKPT_SUPPORT` or `NO_DEBUGGER`. This is mostly debugging options or prints scattered around the code. We also adjust cmake to ignore the specific files surround it, but allowing the rest of the GUI to work. - Fix #431.
2019-05-30 11:50:45 +00:00
${SRC_DEBUGGER}
Moved more GBA specific code to the gba folder.
2009-01-01 16:11:02 +00:00
src/gba/remote.cpp
Allow building the GTK port without debugger support
2008-06-16 20:18:49 +00:00
)
cmake: refactor, better clang support Do some reformatting towards the more modern cmake style. Clean up some code. Support linking to gcc compiled wxWidgets by setting `-D__GXX_ABI_VERSION=` appropriately for clang. Use the new method of calling `FindwxWidgets.cmake`, the old method causes some problems now. Set all necessary policies in both cmake files. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-27 03:25:43 +00:00
set(
HDR_DEBUGGER
Fix compilation issue when `ENABLE_DEBUGGER=Off`. We protect all code relevant to disabling this property with either `BKPT_SUPPORT` or `NO_DEBUGGER`. This is mostly debugging options or prints scattered around the code. We also adjust cmake to ignore the specific files surround it, but allowing the rest of the GUI to work. - Fix #431.
2019-05-30 11:50:45 +00:00
${HDR_DEBUGGER}
Add some header and resource files to CMakeLists.txts (Core+WX) This makes these files show up in generated CodeBlocks projects, which makes life easier for folks who import into QtCreator.
2016-06-07 20:26:53 +00:00
src/gba/remote.h
)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
endif()
Allow building the GTK port without debugger support
2008-06-16 20:18:49 +00:00
Add stb_image headers to cmake.
2020-02-29 23:42:08 +00:00
set(
HDR_STB_IMAGE
Add Catch2 unit testing framework + some tests. Add the Catch2 headers to third_party/include/catch2. Add Catch.cmake and CatchAddTests.cmake to cmake/. Add unit tests src/wx/tests/strutils.cpp using Catch2 to test src/wx/strutils.cpp. Make some code changes to strutils.cpp to make the tests pass. See src/wx/tests/CMakeLists.txt for how to set up unit test files; they plug into the normal CTest mechanism in cmake. The test binaries are written to the tests/ subdirectory of the build directory. Building the tests and enabling the CTest support can be turned off by passing -DBUILD_TESTING=OFF to cmake, the default is ON, this is the standard mechanism. Start running ctest on travis and appveyor. Move stb to third_party/include where Catch2 is now as well. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2020-07-10 13:40:05 +00:00
third_party/include/stb/stb_image.h
third_party/include/stb/stb_image_write.h
Add stb_image headers to cmake.
2020-02-29 23:42:08 +00:00
)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
include_directories(
Fixed CMake for cross-compiling
2008-06-06 16:42:31 +00:00
${ZLIB_INCLUDE_DIR}
fix the cmake/linux build moves dependencies/File_Extractor-1.0.0 to trunk/fex - we can't expect people to have this lib, and fex has dropped support for the "fex_mini".
2010-03-15 03:36:45 +00:00
fex
<wip> Migration to SDL2 made possible by galtgendo, gtk changes to follow.
2015-11-19 02:34:38 +00:00
${SDL2_INCLUDE_DIR}
Add Catch2 unit testing framework + some tests. Add the Catch2 headers to third_party/include/catch2. Add Catch.cmake and CatchAddTests.cmake to cmake/. Add unit tests src/wx/tests/strutils.cpp using Catch2 to test src/wx/strutils.cpp. Make some code changes to strutils.cpp to make the tests pass. See src/wx/tests/CMakeLists.txt for how to set up unit test files; they plug into the normal CTest mechanism in cmake. The test binaries are written to the tests/ subdirectory of the build directory. Building the tests and enabling the CTest support can be turned off by passing -DBUILD_TESTING=OFF to cmake, the default is ON, this is the standard mechanism. Start running ctest on travis and appveyor. Move stb to third_party/include where Catch2 is now as well. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2020-07-10 13:40:05 +00:00
third_party/include/stb
Fixing file.
2008-06-06 10:17:20 +00:00
)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(ENABLE_FFMPEG)
include_directories(
Added support for detected FFMPEG include path
2012-05-23 06:19:44 +00:00
${FFMPEG_INCLUDE_DIRS}
)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
endif()
Added support for detected FFMPEG include path
2012-05-23 06:19:44 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
add_library(
Fixing file.
2008-06-06 10:17:20 +00:00
vbamcore
Fixed cmake to use find the proper xpm file in the xrc folder, also made the vbam core and fex library static to help with building on some platforms.
2015-05-10 22:54:19 +00:00
STATIC
Fixing file.
2008-06-06 10:17:20 +00:00
${PROJECT_SRCS}
${SRC_MAIN}
Add some header and resource files to CMakeLists.txts (Core+WX) This makes these files show up in generated CodeBlocks projects, which makes life easier for folks who import into QtCreator.
2016-06-07 20:26:53 +00:00
${HDR_MAIN}
No more cryptic names ...
2009-01-01 15:20:03 +00:00
${SRC_GBA}
Add some header and resource files to CMakeLists.txts (Core+WX) This makes these files show up in generated CodeBlocks projects, which makes life easier for folks who import into QtCreator.
2016-06-07 20:26:53 +00:00
${HDR_GBA}
No need to use cryptic names
2009-01-01 14:52:03 +00:00
${SRC_GB}
Add some header and resource files to CMakeLists.txts (Core+WX) This makes these files show up in generated CodeBlocks projects, which makes life easier for folks who import into QtCreator.
2016-06-07 20:26:53 +00:00
${HDR_GB}
Moved the APU files up by one level, since they are shared between the GB and GBA cores.
2009-01-01 14:43:18 +00:00
${SRC_APU}
Add some header and resource files to CMakeLists.txts (Core+WX) This makes these files show up in generated CodeBlocks projects, which makes life easier for folks who import into QtCreator.
2016-06-07 20:26:53 +00:00
${HDR_APU}
Moved the filters to their own directory.
2009-01-01 13:02:35 +00:00
${SRC_FILTERS}
Add some header and resource files to CMakeLists.txts (Core+WX) This makes these files show up in generated CodeBlocks projects, which makes life easier for folks who import into QtCreator.
2016-06-07 20:26:53 +00:00
${HDR_FILTERS}
Allow building the GTK port without debugger support
2008-06-16 20:18:49 +00:00
${SRC_DEBUGGER}
Add some header and resource files to CMakeLists.txts (Core+WX) This makes these files show up in generated CodeBlocks projects, which makes life easier for folks who import into QtCreator.
2016-06-07 20:26:53 +00:00
${HDR_DEBUGGER}
Add stb_image headers to cmake.
2020-02-29 23:42:08 +00:00
${HDR_STB_IMAGE}
Fixing file.
2008-06-06 10:17:20 +00:00
)
cmake: Add generate as a vbamcore dependency. Fixes https://github.com/visualboyadvance-m/visualboyadvance-m/issues/542.
2019-10-11 13:56:34 +00:00
add_dependencies(vbamcore generate)
Add C++11 in cmake as default Currently, the build is broken on Linux as fixed width integers (for example uint32) are used via <cstdint> without a namespace. This is only allowed in C++11 and later. See http://en.cppreference.com/w/cpp/types/integer for details.
2016-07-30 23:00:38 +00:00
set_property(TARGET vbamcore PROPERTY CXX_STANDARD 11)
set_property(TARGET vbamcore PROPERTY CXX_STANDARD_REQUIRED ON)
Fixing file.
2008-06-06 10:17:20 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(ENABLE_SDL)
add_executable(
Fixing file.
2008-06-06 10:17:20 +00:00
vbam
WIN32
${SRC_SDL}
Add some header and resource files to CMakeLists.txts (Core+WX) This makes these files show up in generated CodeBlocks projects, which makes life easier for folks who import into QtCreator.
2016-06-07 20:26:53 +00:00
${HDR_SDL}
Fixing file.
2008-06-06 10:17:20 +00:00
)
Add C++11 in cmake as default Currently, the build is broken on Linux as fixed width integers (for example uint32) are used via <cstdint> without a namespace. This is only allowed in C++11 and later. See http://en.cppreference.com/w/cpp/types/integer for details.
2016-07-30 23:00:38 +00:00
set_property(TARGET vbam PROPERTY CXX_STANDARD 11)
set_property(TARGET vbam PROPERTY CXX_STANDARD_REQUIRED ON)
Fixing file.
2008-06-06 10:17:20 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(WIN32)
cmake: Visual Studio support improvements. Add support for vcpkg ffmpeg, this requires using someone's FindFFmpeg.cmake instead of relying on pkg-config, since vcpkg does not have pkg-config. Do not use the ffmpeg from vcpkg on appveyor however, because that pushes the build cache generation over the time limit for jobs. Add secur32 and bcrypt to the list of ffmpeg libs on windows, these are standard windows libraries. Change some code in ffmpeg.cpp to remove C-style casts of struct initializers, which are illegal in MSVC. Add the INT64_C and UINT64_C macros missing in MSVC's stdint.h (if not defined) to ffmpeg.h before the ffmpeg headers are included, because they rely on them. Rewrite the wxWidgets finding code for the vcpkg wxWidgets to be nicer and work correctly for debug and static builds. Remove all /W* and /w* warnings options from cmake compiler flags, and replace them with /W4 for debug builds, and /w (no warnings) for release modes. When building a static binary, remove all /MD* flags from cmake compiler flags, and use /MT for static release builds and /MTd for static debug builds. Improve the vcpkg toolchain wrapper to only rebuild the vcpkg binary if there were git updates. Redo the handling of SDL2 and SDL_main. Only link SDL2Main to the SDL binary and don't use the definitions. Update CMakeSettings.json to use Ninja and include static configurations. Use CMAKE_PROJECT_DIR instead of CMAKE_SOURCE_DIR to determine the vcpkg root, as CMAKE_SOURCE_DIR is sometimes set incorrectly in the 2017 GUI. Add /nodefaultlib:libcmt to the debug build link flags, as in debug builds libcmtd is used and libcmt should not be. Add /subsystem:console to debug build link flags to produce a windows console app for debug builds, like we do for mingw builds. To do this, define a WIN32_CONSOLE_APP macro and if set, define a main() that calls WinMain(). Call wxMesdsageOutput::Set() in OnInit with an instance of wxMessageOutputStderr for windows debug builds to make sure the --help text etc. goes to the console instead of a popup box. Update the Visual Studio related text in README.md. Fix dynamic debug builds by linking to the debug version of SDL2 and copying the debug version of the dll to the build dir. Fix issue in MainFrame::BindAppIcon with the function we are using not being found in a Windows DLL in debug builds by using wxDynamicLibrary::GetSymboolAorW() instead of GetSymbol(). Enable LTO for MSVC in Release modes, if the option is set. Change appveyor config to use an 8 item build matrix of x64/x86 / Release/Debug / Static/Dynamic. And test the binary in debug modes by running --help. When copying the wxrc.exe out of the build tree, copy both the release and debug versions, this is so that appveyor caching of vcpkg works, since the build trees are not cached. Add some necessary win32 libraries to the SDL binary. And enable building it on appveyor. Fix #465. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-10 11:13:58 +00:00
set(WIN32_LIBRARIES wsock32 ws2_32 winmm version imm32)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
endif()
Fixed CMake for cross-compiling
2008-06-06 16:42:31 +00:00
cmake: Remove libcmt from SDL bin in debug mode. For the SDL binary vbam when built with MSVC add /nodefaultlib:libcmt to debug link flags, because in debug mode libcmtd is linked and libcmt should not be. This is the same as was done for the wx executable in cf9a88df. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-22 17:46:21 +00:00
if(MSVC)
# the debug lib libcmtd is linked in debug mode, so don't link the normal version
set_target_properties(vbam PROPERTIES LINK_FLAGS_DEBUG "/nodefaultlib:libcmt")
endif()
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(ENABLE_LIRC)
set(LIRC_CLIENT_LIBRARY lirc_client)
endif()
SDL build/configuration patches (martinultima, chrono): http://vba-m.ngemu.com/forum/gbc-cheats-gameshark-compile-fixes-t-193.html
2008-08-03 21:02:37 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
target_link_libraries(
Fixing file.
2008-06-06 10:17:20 +00:00
vbam
all current vba-m Wx patches applied to trunk.
2011-05-25 11:55:46 +00:00
${VBAMCORE_LIBS}
Fixed CMake for cross-compiling
2008-06-06 16:42:31 +00:00
${WIN32_LIBRARIES}
SDL build/configuration patches (martinultima, chrono): http://vba-m.ngemu.com/forum/gbc-cheats-gameshark-compile-fixes-t-193.html
2008-08-03 21:02:37 +00:00
${LIRC_CLIENT_LIBRARY}
Fixing file.
2008-06-06 10:17:20 +00:00
)
cmake: Visual Studio support improvements. Add support for vcpkg ffmpeg, this requires using someone's FindFFmpeg.cmake instead of relying on pkg-config, since vcpkg does not have pkg-config. Do not use the ffmpeg from vcpkg on appveyor however, because that pushes the build cache generation over the time limit for jobs. Add secur32 and bcrypt to the list of ffmpeg libs on windows, these are standard windows libraries. Change some code in ffmpeg.cpp to remove C-style casts of struct initializers, which are illegal in MSVC. Add the INT64_C and UINT64_C macros missing in MSVC's stdint.h (if not defined) to ffmpeg.h before the ffmpeg headers are included, because they rely on them. Rewrite the wxWidgets finding code for the vcpkg wxWidgets to be nicer and work correctly for debug and static builds. Remove all /W* and /w* warnings options from cmake compiler flags, and replace them with /W4 for debug builds, and /w (no warnings) for release modes. When building a static binary, remove all /MD* flags from cmake compiler flags, and use /MT for static release builds and /MTd for static debug builds. Improve the vcpkg toolchain wrapper to only rebuild the vcpkg binary if there were git updates. Redo the handling of SDL2 and SDL_main. Only link SDL2Main to the SDL binary and don't use the definitions. Update CMakeSettings.json to use Ninja and include static configurations. Use CMAKE_PROJECT_DIR instead of CMAKE_SOURCE_DIR to determine the vcpkg root, as CMAKE_SOURCE_DIR is sometimes set incorrectly in the 2017 GUI. Add /nodefaultlib:libcmt to the debug build link flags, as in debug builds libcmtd is used and libcmt should not be. Add /subsystem:console to debug build link flags to produce a windows console app for debug builds, like we do for mingw builds. To do this, define a WIN32_CONSOLE_APP macro and if set, define a main() that calls WinMain(). Call wxMesdsageOutput::Set() in OnInit with an instance of wxMessageOutputStderr for windows debug builds to make sure the --help text etc. goes to the console instead of a popup box. Update the Visual Studio related text in README.md. Fix dynamic debug builds by linking to the debug version of SDL2 and copying the debug version of the dll to the build dir. Fix issue in MainFrame::BindAppIcon with the function we are using not being found in a Windows DLL in debug builds by using wxDynamicLibrary::GetSymboolAorW() instead of GetSymbol(). Enable LTO for MSVC in Release modes, if the option is set. Change appveyor config to use an 8 item build matrix of x64/x86 / Release/Debug / Static/Dynamic. And test the binary in debug modes by running --help. When copying the wxrc.exe out of the build tree, copy both the release and debug versions, this is so that appveyor caching of vcpkg works, since the build trees are not cached. Add some necessary win32 libraries to the SDL binary. And enable building it on appveyor. Fix #465. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-10 11:13:58 +00:00
if(WIN32)
target_link_libraries(vbam ${SDL2MAIN_LIBRARY})
endif()
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vbam${CMAKE_EXECUTABLE_SUFFIX} DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
cmake fixes -Whitespace fixes -Binaries installation fixes
2016-12-10 23:27:18 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(WIN32)
cmake: refactor, better clang support Do some reformatting towards the more modern cmake style. Clean up some code. Support linking to gcc compiled wxWidgets by setting `-D__GXX_ABI_VERSION=` appropriately for clang. Use the new method of calling `FindwxWidgets.cmake`, the old method causes some problems now. Set all necessary policies in both cmake files. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-27 03:25:43 +00:00
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example
DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}
RENAME vbam.cfg
)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
else()
cmake: refactor, better clang support Do some reformatting towards the more modern cmake style. Clean up some code. Support linking to gcc compiled wxWidgets by setting `-D__GXX_ABI_VERSION=` appropriately for clang. Use the new method of calling `FindwxWidgets.cmake`, the old method causes some problems now. Set all necessary policies in both cmake files. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-03-27 03:25:43 +00:00
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example
DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}
RENAME vbam.cfg
)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
endif()
endif()
Fixing file.
2008-06-06 10:17:20 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(ENABLE_WX)
all current vba-m Wx patches applied to trunk.
2011-05-25 11:55:46 +00:00
add_subdirectory(src/wx)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
endif()
all current vba-m Wx patches applied to trunk.
2011-05-25 11:55:46 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(ENABLE_WX)
GTK: More NLS WIP
2011-02-24 17:46:59 +00:00
# Native Language Support
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(ENABLE_NLS)
GTK: More NLS WIP
2011-02-24 17:46:59 +00:00
add_subdirectory(po)
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
endif()
endif()
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/vba-over.ini DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/vbam)
Installed man pages on unix-ish platforms. Patch by Mook.
2015-05-18 00:28:34 +00:00
# manual pages
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
if(UNIX)
if(ENABLE_SDL)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/vbam.6 DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man6)
endif()
if(ENABLE_WX)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/visualboyadvance-m.6 DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man6)
endif()
endif()
Installed man pages on unix-ish platforms. Patch by Mook.
2015-05-18 00:28:34 +00:00
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
set(CPACK_GENERATOR "ZIP")
rename exe and added more cpack stuff.
2015-06-15 13:00:47 +00:00
set(CPACK_SOURCE_GENERATOR "TGZ")
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
set(CPACK_PACKAGE_VERSION_MAJOR "2")
set(CPACK_PACKAGE_VERSION_MINOR "0")
set(CPACK_PACKAGE_VERSION_PATCH "0-Git-" ${COMMITHASH})
make cpack ignore the dep folder
2015-06-15 13:20:20 +00:00
list(APPEND CPACK_SOURCE_IGNORE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/dependencies")
add multi-platform build system under `tools/` add some scripts to invoke the build system to build all deps for vbam and vbam itself: - `tools/linux/builder` This builds a mostly static linux binary with a few dynamic deps for xorg and wayland. Using gtk3. This will run on just about any dist. - `tools/osx/builder` Builds a static mac app targetting 10.7. - `tools/win/linux-cross-builder` Builds a static windows binary using the mingw-w64 toolchain. - `tools/win/msys2-builder` Builds a static windows binary in the MSYS2 environment, this may be suffering from a few regressions. Change some cmake code to support the build system, refactor a few things in it.
2018-02-24 19:39:29 +00:00
include(CPack)
Add Catch2 unit testing framework + some tests. Add the Catch2 headers to third_party/include/catch2. Add Catch.cmake and CatchAddTests.cmake to cmake/. Add unit tests src/wx/tests/strutils.cpp using Catch2 to test src/wx/strutils.cpp. Make some code changes to strutils.cpp to make the tests pass. See src/wx/tests/CMakeLists.txt for how to set up unit test files; they plug into the normal CTest mechanism in cmake. The test binaries are written to the tests/ subdirectory of the build directory. Building the tests and enabling the CTest support can be turned off by passing -DBUILD_TESTING=OFF to cmake, the default is ON, this is the standard mechanism. Start running ctest on travis and appveyor. Move stb to third_party/include where Catch2 is now as well. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2020-07-10 13:40:05 +00:00
# vim:sw=4 et tw=0: