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/cmake/Architecture.cmake

41 lines
1.3 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(NOT CMAKE_SYSTEM_PROCESSOR)
if(NOT CMAKE_TOOLCHAIN_FILE AND CMAKE_HOST_SYSTEM_PROCESSOR)
set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_HOST_SYSTEM_PROCESSOR})
elseif(CMAKE_TOOLCHAIN_FILE MATCHES mxe)
if(CMAKE_TOOLCHAIN_FILE MATCHES "i[3-9]86")
set(CMAKE_SYSTEM_PROCESSOR i686)
else()
set(CMAKE_SYSTEM_PROCESSOR x86_64)
endif()
endif()
endif()
cmake: Release automation followup. Followup on e98d8931. Set the BITS variable in Architecture.cmake even if CMAKE_SYSTEM_PROCESSOR is not set, and it often isn't. This allows for generating the right release zip for 32 bit MinGW builds. When invoking zip to make the translations.zip, use `.` instead of `*` as the argument, with the correct WORKING_DIRECTORY, so as not to rely on shell globbing of any sort. This broke for the 32 bit MinGW cross build. Fix the keychain unlock command on mac, the keychain must be unlocked to use the codesigning certificate. Fix the translations.zip.asc signature overwrite prompt on Windows. For the mac builder, automatically use Xcode 9 for 32 bit builds if installed, this is necessary on 10.14 (Mojave) and later. Add interactive-pause.cmake script to wait for the user to press enter before continuing, invoke it before gpg commands so that waiting for the passphrase does not time out. It will not run if ENV{CI} is set or ENV{VBAM_NO_PAUSE} is set, this is so that later we can set up automated builds. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-25 23:14:45 +00:00
# The processor may not be set, but set BITS regardless.
if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 4)
set(BITS 32)
elseif(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8)
set(BITS 64)
endif()
# Turn asm on by default on 32bit x86 and set WINARCH for windows stuff.
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(CMAKE_SYSTEM_PROCESSOR MATCHES "[xX]86|i[3-9]86|[aA][mM][dD]64")
if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 4) # 32 bit
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
set(ASM_DEFAULT ON)
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(X86_32 ON)
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
set(X86 ON)
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(WINARCH x86)
cmake: Release automation followup. Followup on e98d8931. Set the BITS variable in Architecture.cmake even if CMAKE_SYSTEM_PROCESSOR is not set, and it often isn't. This allows for generating the right release zip for 32 bit MinGW builds. When invoking zip to make the translations.zip, use `.` instead of `*` as the argument, with the correct WORKING_DIRECTORY, so as not to rely on shell globbing of any sort. This broke for the 32 bit MinGW cross build. Fix the keychain unlock command on mac, the keychain must be unlocked to use the codesigning certificate. Fix the translations.zip.asc signature overwrite prompt on Windows. For the mac builder, automatically use Xcode 9 for 32 bit builds if installed, this is necessary on 10.14 (Mojave) and later. Add interactive-pause.cmake script to wait for the user to press enter before continuing, invoke it before gpg commands so that waiting for the passphrase does not time out. It will not run if ENV{CI} is set or ENV{VBAM_NO_PAUSE} is set, this is so that later we can set up automated builds. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-25 23:14:45 +00:00
elseif(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8)
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(AMD64 ON)
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
set(X64 ON)
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(WINARCH x64)
cmake: Make wrong vcpkg arch error more clear. Followup on 49ca52ba. Improve the code that shows a fatal error if the vcpkg target architecture does not match the build environment, by showing both the target architecture and the build environment architecture. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-16 00:56:10 +00:00
endif()
if(DEFINED VCPKG_TARGET_TRIPLET)
string(REGEX MATCH "^x[86][64]" target_arch ${VCPKG_TARGET_TRIPLET})
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
cmake: Make wrong vcpkg arch error more clear. Followup on 49ca52ba. Improve the code that shows a fatal error if the vcpkg target architecture does not match the build environment, by showing both the target architecture and the build environment architecture. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
2019-12-16 00:56:10 +00:00
if(NOT WINARCH STREQUAL target_arch)
message(FATAL_ERROR "Wrong build environment architecture for VCPKG_TARGET_TRIPLET, you specified ${target_arch} but your compiler is for ${WINARCH}")
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
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()
endif()