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

706 lines
20 KiB
CMake
Raw Normal View History

CMAKE: Use built in support for ASM compilers. Bump required version to 2.6.0
2011-02-20 13:31:49 +00:00
# The project's name is VBA-M it uses C and C++ code
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
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
cmake_minimum_required( VERSION 3.3.2 )
IF(CMAKE_BUILD_TYPE STREQUAL "")
SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build Type" FORCE)
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
SET(ALL_TARGETS fex gvbam visualboyadvance-m vbamcore vbam)
Silence CMake warnings
2008-06-06 18:56:41 +00:00
if( COMMAND cmake_policy )
cmake_policy( SET CMP0003 NEW )
Fixed CMake
2008-06-08 20:46:25 +00:00
cmake_policy( SET CMP0005 OLD )
Silence CMake warnings
2008-06-06 18:56:41 +00:00
endif( COMMAND cmake_policy )
SET( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeScripts )
cmakelists changes, wxwidgets interface build fix to follow.
2015-03-27 17:48:42 +00:00
#Output all binaries at top level
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
Fixing file.
2008-06-06 10:17:20 +00:00
make ENABLE_SDL default to OFF Default building options now just build the Wx port. Also set +x on ./installdeps-msys2 .
2016-11-20 13:46:24 +00:00
option( ENABLE_SDL "Build the SDL port" OFF )
try and get mingw to force static gcc and libc++
2015-05-18 03:04:34 +00:00
option( ENABLE_GTK "Build the GTK+ GUI" OFF )
<wip> Migration to SDL2 made possible by galtgendo, gtk changes to follow.
2015-11-19 02:34:38 +00:00
option( ENABLE_GTK3 "Build the GTK+ GUI" OFF )
try and get mingw to force static gcc and libc++
2015-05-18 03:04:34 +00:00
option( ENABLE_WX "Build the wxWidgets port" ON )
CMAKE: Clarify CMakeLists.txt a bit
2011-02-24 11:14:59 +00:00
option( ENABLE_DEBUGGER "Enable the debugger" ON )
GTK: NLS support WIP
2011-02-24 13:06:17 +00:00
option( ENABLE_NLS "Enable translations" ON )
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
SET(ASM_CORE_DEFAULT OFF)
SET(ASM_SCALERS_DEFAULT OFF)
SET(MMX_DEFAULT OFF)
# turn asm on by default on 32bit x86
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
IF(CMAKE_SYSTEM_PROCESSOR MATCHES "[xX]86|[aA][mM][dD]64|[xX]64")
IF(CMAKE_C_SIZEOF_DATA_PTR EQUAL 4) # 32 bit
SET(ASM_CORE_DEFAULT ON)
SET(ASM_SCALERS_DEFAULT ON)
SET(MMX_DEFAULT ON)
SET(X86_32 ON)
ELSE()
SET(AMD64 ON)
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
ENDIF()
option( ENABLE_ASM_CORE "Enable x86 ASM CPU cores" ${ASM_CORE_DEFAULT})
option( ENABLE_ASM_SCALERS "Enable x86 ASM graphic filters" ${ASM_SCALERS_DEFAULT})
if(ENABLE_ASM_SCALERS)
option( ENABLE_MMX "Enable MMX" ${MMX_DEFAULT})
endif(ENABLE_ASM_SCALERS)
fix wx GL viewport + build improvements Add GetRealPixelClientSize() method to HiDPIAware and implement using wx GetClientSize() in panel.cpp for the generic version, and using convertSizeToBacking: in macsupport.mm . Add an AdjustViewport() method to GLDrawingPanel that sets glViewport() using GetRealPixelClientSize(), and call it for the SIZE event. Debug print the viewport size here instead of in DrawingPanelInit(). Build improvements: * default to Cairo off for all platforms, currently libcairo2-dev does not install on Ubuntu * default to ON for ENABLE_LINK and ENABLE_FFMPEG (for game recording), this will allow for more fully-featured default builds * do not set SFML_STATIC_LIBRARIES on Mac because this is currently broken * fix the Mac bundling/linking script to deal with links in dependent libs that already use @rpath (very minor change.)
2016-11-08 12:51:26 +00:00
option( ENABLE_LINK "Enable GBA linking functionality" ON )
CMAKE: Clarify CMakeLists.txt a bit
2011-02-24 11:14:59 +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
SET(FFMPEG_DEFAULT ON)
IF((WIN32 AND NOT (MINGW AND MSYS)) OR APPLE)
SET(FFMPEG_DEFAULT OFF)
ENDIF()
option(ENABLE_FFMPEG "Enable ffmpeg A/V recording" ${FFMPEG_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
SET(LTO_DEFAULT ON)
IF(AMD64 AND WIN32 AND CMAKE_COMPILER_IS_GNUCXX)
SET(LTO_DEFAULT OFF)
ENDIF()
OPTION(ENABLE_LTO "Compile with Link Time Optimization (gcc and clang only)" ${LTO_DEFAULT})
buncha patches by darktjm sdl fix not applied yet
2011-05-24 07:39:29 +00:00
option( ENABLE_GBA_LOGGING "Enable extended GBA logging" ON )
if( ENABLE_GBA_LOGGING )
ADD_DEFINITIONS (-DGBA_LOGGING )
endif( ENABLE_GBA_LOGGING )
if(ENABLE_MMX)
ADD_DEFINITIONS (-DMMX)
endif(ENABLE_MMX)
CMAKE: Clarify CMakeLists.txt a bit
2011-02-24 11:14:59 +00:00
# The SDL port can't be built without debugging support
if( NOT ENABLE_DEBUGGER AND ENABLE_SDL )
message( SEND_ERROR "The SDL port can't be built without debugging support" )
endif( NOT ENABLE_DEBUGGER AND ENABLE_SDL )
Fixing file.
2008-06-06 10:17:20 +00:00
CMAKE: Clarify CMakeLists.txt a bit
2011-02-24 11:14:59 +00:00
# Set the version number with -DVERSION=X.X.X-uber
Fixing file.
2008-06-06 10:17:20 +00:00
IF( NOT VERSION )
will need to start changing the version for git
2015-06-12 11:51:15 +00:00
#Will need to change this over to git
added git support to cmakelists.txt
2015-06-12 12:04:26 +00:00
SET( VERSION "https://github.com/visualboyadvance-m/visualboyadvance-m" )
You didn't see us change the version to 2.0.0 *waves hands mysteriously*
2015-05-18 02:41:21 +00:00
added git support to cmakelists.txt
2015-06-12 12:04:26 +00:00
#openmw does this
if(EXISTS ${PROJECT_SOURCE_DIR}/.git)
if(NOT EXISTS ${PROJECT_SOURCE_DIR}/.git/shallow)
find_package(Git)
if(GIT_FOUND)
include(GetGitRevisionDescription)
get_git_head_revision(REFSPEC COMMITHASH)
SET( VERSION "GIT Commit: " ${COMMITHASH} )
else(GIT_FOUND)
message(WARNING "Git executable not found")
endif(GIT_FOUND)
else(NOT EXISTS ${PROJECT_SOURCE_DIR}/.git/shallow)
message(STATUS "Shallow Git clone detected, not attempting to retrieve version info")
endif(NOT EXISTS ${PROJECT_SOURCE_DIR}/.git/shallow)
endif(EXISTS ${PROJECT_SOURCE_DIR}/.git)
Fixing file.
2008-06-06 10:17:20 +00:00
ENDIF( NOT VERSION )
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
IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
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
ADD_DEFINITIONS(-DDEBUG)
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
ELSE()
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
ADD_DEFINITIONS(-DNDEBUG)
ENDIF()
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
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
IF(APPLE)
generalize ./installdeps + mac pkg mgrs support Add a more general purpose ./installdeps script to replace ./installdeps-msys2 that handles: Debian Linux, Arch Linux, MSYS2+MinGW, Mac Homebrew, MacPorts and Fink for Mac. More OSes and distributions will be added in the future, and the script may be generalized for use in other projects. Move Mac package manager setup code into MacPackageManagers.cmake and greatly improve it. Handles Homebrew, MacPorts and Fink correctly. Minor tweaks for FindSDL2.cmake: better include dir searching that works on cygwin, fix flags for MinGW, and quiet pkg-config program errors. Add MinGW cross-compilation toolchain files, they can be specified on the cmake command line with: -DCMAKE_TOOLCHAIN_FILE=../CMakeScripts/Toolchain-cross-MinGW-w64-i686.cmake or -DCMAKE_TOOLCHAIN_FILE=../CMakeScripts/Toolchain-cross-MinGW-w64-x86_64.cmake these work for Cygwin and should work for MinGW on Linux as well.
2016-12-11 07:28:28 +00:00
INCLUDE(MacPackageManagers)
Mac build improvements Move closer to allowing an "out of the box" distributable build for Mac: * fix the icon for the .app * link SDL2 statically, a PR has been sent to the original repo here: https://github.com/tcbrindle/sdl2-cmake-scripts/pull/9 * link SFML statically TODO: For a releasable build on OS X, system libs must be linked dynamically while third party libs are linked statically or bundled. The goal is to link them statically. The two remaining libs that need static linking are PNG and wX. For PNG a similar approach to the one used for SDL2 using pkg-config should work fine and be simple to implement. For wX things are more complicated. The default build of wX does not include static libs, I will need to submit a PR for Homebrew to change the default build to include both dynamic and static versions.
2016-10-26 23:58:21 +00:00
ENDIF(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
# We do not support amd64 asm yet
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
IF(AMD64 AND (ENABLE_ASM_CORE OR ENABLE_ASM_SCALERS OR ENABLE_MMX))
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
MESSAGE(FATAL_ERROR "The options ASM_CORE, ASM_SCALERS and MMX are not supported on AMD64 yet.")
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
IF(ENABLE_ASM_CORE OR ENABLE_ASM_SCALERS)
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
ENABLE_LANGUAGE(ASM_NASM)
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
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
Mac build improvements Move closer to allowing an "out of the box" distributable build for Mac: * fix the icon for the .app * link SDL2 statically, a PR has been sent to the original repo here: https://github.com/tcbrindle/sdl2-cmake-scripts/pull/9 * link SFML statically TODO: For a releasable build on OS X, system libs must be linked dynamically while third party libs are linked statically or bundled. The goal is to link them statically. The two remaining libs that need static linking are PNG and wX. For PNG a similar approach to the one used for SDL2 using pkg-config should work fine and be simple to implement. For wX things are more complicated. The default build of wX does not include static libs, I will need to submit a PR for Homebrew to change the default build to include both dynamic and static versions.
2016-10-26 23:58:21 +00:00
FIND_PACKAGE(ZLIB REQUIRED)
FIND_PACKAGE(OpenGL REQUIRED)
# TODO: make static on mac
FIND_PACKAGE(PNG REQUIRED)
generalize ./installdeps + mac pkg mgrs support Add a more general purpose ./installdeps script to replace ./installdeps-msys2 that handles: Debian Linux, Arch Linux, MSYS2+MinGW, Mac Homebrew, MacPorts and Fink for Mac. More OSes and distributions will be added in the future, and the script may be generalized for use in other projects. Move Mac package manager setup code into MacPackageManagers.cmake and greatly improve it. Handles Homebrew, MacPorts and Fink correctly. Minor tweaks for FindSDL2.cmake: better include dir searching that works on cygwin, fix flags for MinGW, and quiet pkg-config program errors. Add MinGW cross-compilation toolchain files, they can be specified on the cmake command line with: -DCMAKE_TOOLCHAIN_FILE=../CMakeScripts/Toolchain-cross-MinGW-w64-i686.cmake or -DCMAKE_TOOLCHAIN_FILE=../CMakeScripts/Toolchain-cross-MinGW-w64-x86_64.cmake these work for Cygwin and should work for MinGW on Linux as well.
2016-12-11 07:28:28 +00:00
IF(APPLE AND NOT MACPORTS)
Mac build improvements Move closer to allowing an "out of the box" distributable build for Mac: * fix the icon for the .app * link SDL2 statically, a PR has been sent to the original repo here: https://github.com/tcbrindle/sdl2-cmake-scripts/pull/9 * link SFML statically TODO: For a releasable build on OS X, system libs must be linked dynamically while third party libs are linked statically or bundled. The goal is to link them statically. The two remaining libs that need static linking are PNG and wX. For PNG a similar approach to the one used for SDL2 using pkg-config should work fine and be simple to implement. For wX things are more complicated. The default build of wX does not include static libs, I will need to submit a PR for Homebrew to change the default build to include both dynamic and static versions.
2016-10-26 23:58:21 +00:00
SET(SDL2_STATIC ON)
generalize ./installdeps + mac pkg mgrs support Add a more general purpose ./installdeps script to replace ./installdeps-msys2 that handles: Debian Linux, Arch Linux, MSYS2+MinGW, Mac Homebrew, MacPorts and Fink for Mac. More OSes and distributions will be added in the future, and the script may be generalized for use in other projects. Move Mac package manager setup code into MacPackageManagers.cmake and greatly improve it. Handles Homebrew, MacPorts and Fink correctly. Minor tweaks for FindSDL2.cmake: better include dir searching that works on cygwin, fix flags for MinGW, and quiet pkg-config program errors. Add MinGW cross-compilation toolchain files, they can be specified on the cmake command line with: -DCMAKE_TOOLCHAIN_FILE=../CMakeScripts/Toolchain-cross-MinGW-w64-i686.cmake or -DCMAKE_TOOLCHAIN_FILE=../CMakeScripts/Toolchain-cross-MinGW-w64-x86_64.cmake these work for Cygwin and should work for MinGW on Linux as well.
2016-12-11 07:28:28 +00:00
ENDIF()
Mac build improvements Move closer to allowing an "out of the box" distributable build for Mac: * fix the icon for the .app * link SDL2 statically, a PR has been sent to the original repo here: https://github.com/tcbrindle/sdl2-cmake-scripts/pull/9 * link SFML statically TODO: For a releasable build on OS X, system libs must be linked dynamically while third party libs are linked statically or bundled. The goal is to link them statically. The two remaining libs that need static linking are PNG and wX. For PNG a similar approach to the one used for SDL2 using pkg-config should work fine and be simple to implement. For wX things are more complicated. The default build of wX does not include static libs, I will need to submit a PR for Homebrew to change the default build to include both dynamic and static versions.
2016-10-26 23:58:21 +00:00
FIND_PACKAGE(SDL2 REQUIRED)
ADD_DEFINITIONS(${SDL2_DEFINITIONS})
CMAKE: Clarify CMakeLists.txt a bit
2011-02-24 11:14:59 +00:00
if( ENABLE_LINK )
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
# msys2 does not have static sfml libs atm
if(WIN32 AND NOT (MINGW AND MSYS))
some changes regarding static building via mingw
2015-05-21 18:42:02 +00:00
set(SFML_STATIC_LIBRARIES TRUE)
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
endif()
SFML is required for link support.
2016-11-10 11:39:45 +00:00
FIND_PACKAGE ( SFML 2 COMPONENTS network system REQUIRED )
CMAKE: Clarify CMakeLists.txt a bit
2011-02-24 11:14:59 +00:00
endif( ENABLE_LINK )
Mac build improvements Move closer to allowing an "out of the box" distributable build for Mac: * fix the icon for the .app * link SDL2 statically, a PR has been sent to the original repo here: https://github.com/tcbrindle/sdl2-cmake-scripts/pull/9 * link SFML statically TODO: For a releasable build on OS X, system libs must be linked dynamically while third party libs are linked statically or bundled. The goal is to link them statically. The two remaining libs that need static linking are PNG and wX. For PNG a similar approach to the one used for SDL2 using pkg-config should work fine and be simple to implement. For wX things are more complicated. The default build of wX does not include static libs, I will need to submit a PR for Homebrew to change the default build to include both dynamic and static versions.
2016-10-26 23:58:21 +00:00
all current vba-m Wx patches applied to trunk.
2011-05-25 11:55:46 +00:00
# set the standard libraries all ports use
SET(VBAMCORE_LIBS
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
${PNG_LIBRARY}
)
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)
FIND_PACKAGE ( PkgConfig REQUIRED )
PKG_CHECK_MODULES(FFMPEG REQUIRED libavcodec libavformat libswscale libavutil)
endif(ENABLE_FFMPEG)
if(NOT ENABLE_FFMPEG)
ADD_DEFINITIONS(-DNO_FFMPEG)
endif(NOT ENABLE_FFMPEG)
CMAKE: Clarify CMakeLists.txt a bit
2011-02-24 11:14:59 +00:00
IF( ENABLE_LIRC )
ADDED LIRC support in SDL build
2008-07-10 23:41:29 +00:00
SET( WITHLIRC 1 )
CMAKE: Clarify CMakeLists.txt a bit
2011-02-24 11:14:59 +00:00
ELSE( ENABLE_LIRC )
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
SET( WITHLIRC 0 )
CMAKE: Clarify CMakeLists.txt a bit
2011-02-24 11:14:59 +00:00
ENDIF( ENABLE_LIRC )
Fixing file.
2008-06-06 10:17:20 +00:00
# Set the default install dir
IF( NOT DATA_INSTALL_DIR )
SET( DATA_INSTALL_DIR "share/vbam" )
ENDIF( NOT DATA_INSTALL_DIR )
SET( PKGDATADIR ${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR} )
# Set the configuration file location
Fix DSYSCONF_INSTALL_DIR I'm not sure if this was changed in cmake recently, but "SYSCONFDIR" is incorrect. It should be SYSCONF_INSTALL_DIR. As well CMAKE_INSTALL_PREFIX refers to /usr or /usr/local in linux, so installing it into ${CMAKE_INSTALL_PREFIX}/${SYSCONFDIR} would be incorrect. I've wrapped it in the existing IF( WIN32 ) to preserve the installation for windows, a window dev should fix that if it's incorrect.
2016-12-09 17:44:11 +00:00
IF( NOT SYSCONF_INSTALL_DIR )
SET( SYSCONF_INSTALL_DIR "/etc" )
ENDIF( NOT SYSCONF_INSTALL_DIR )
Fixing file.
2008-06-06 10:17:20 +00:00
# C defines
Fix DSYSCONF_INSTALL_DIR I'm not sure if this was changed in cmake recently, but "SYSCONFDIR" is incorrect. It should be SYSCONF_INSTALL_DIR. As well CMAKE_INSTALL_PREFIX refers to /usr or /usr/local in linux, so installing it into ${CMAKE_INSTALL_PREFIX}/${SYSCONFDIR} would be incorrect. I've wrapped it in the existing IF( WIN32 ) to preserve the installation for windows, a window dev should fix that if it's incorrect.
2016-12-09 17:44:11 +00:00
ADD_DEFINITIONS (-DHAVE_NETINET_IN_H -DHAVE_ARPA_INET_H -DHAVE_ZLIB_H -DFINAL_VERSION -DSDL -DUSE_OPENGL -DSYSCONF_INSTALL_DIR='"${SYSCONF_INSTALL_DIR}"' -DWITH_LIRC='${WITHLIRC}')
Fixing file.
2008-06-06 10:17:20 +00:00
ADD_DEFINITIONS (-DVERSION='"${VERSION}"' -DPKGDATADIR='"${PKGDATADIR}"' -DPACKAGE='')
all current vba-m Wx patches applied to trunk.
2011-05-25 11:55:46 +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
all current vba-m Wx patches applied to trunk.
2011-05-25 11:55:46 +00:00
FIND_LIBRARY(RT_LIB rt)
IF(RT_LIB)
CMAKE: sem_timedwait is found in pthread on newer linuxes
2012-09-07 19:09:16 +00:00
SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${RT_LIB})
all current vba-m Wx patches applied to trunk.
2011-05-25 11:55:46 +00:00
SET(VBAMCORE_LIBS ${VBAMCORE_LIBS} ${RT_LIB})
ENDIF(RT_LIB)
You didn't see us change the version to 2.0.0 *waves hands mysteriously*
2015-05-18 02:41:21 +00:00
CMAKE: sem_timedwait is found in pthread on newer linuxes
2012-09-07 19:09:16 +00:00
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(PTHREAD_LIB)
You didn't see us change the version to 2.0.0 *waves hands mysteriously*
2015-05-18 02:41:21 +00:00
all current vba-m Wx patches applied to trunk.
2011-05-25 11:55:46 +00:00
INCLUDE(CheckFunctionExists)
CHECK_FUNCTION_EXISTS(sem_timedwait SEM_TIMEDWAIT)
IF( SEM_TIMEDWAIT)
ADD_DEFINITIONS (-DHAVE_SEM_TIMEDWAIT)
ENDIF( SEM_TIMEDWAIT)
else( ENABLE_LINK )
GTK: Turned the last menu based settings into a dialog
2011-02-20 19:03:38 +00:00
ADD_DEFINITIONS (-DNO_LINK)
all current vba-m Wx patches applied to trunk.
2011-05-25 11:55:46 +00:00
endif( ENABLE_LINK )
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
CMAKE: Clarify CMakeLists.txt a bit
2011-02-24 11:14:59 +00:00
if( NOT ENABLE_DEBUGGER )
Allow building the GTK port without debugger support
2008-06-16 20:18:49 +00:00
ADD_DEFINITIONS (-DNO_DEBUGGER)
CMAKE: Clarify CMakeLists.txt a bit
2011-02-24 11:14:59 +00:00
else( NOT ENABLE_DEBUGGER )
Allow building the GTK port without debugger support
2008-06-16 20:18:49 +00:00
ADD_DEFINITIONS (-DBKPT_SUPPORT)
CMAKE: Clarify CMakeLists.txt a bit
2011-02-24 11:14:59 +00:00
endif( NOT ENABLE_DEBUGGER )
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
CMAKE: Clarify CMakeLists.txt a bit
2011-02-24 11:14:59 +00:00
IF( NOT ENABLE_ASM_CORE )
Fixing file.
2008-06-06 10:17:20 +00:00
ADD_DEFINITIONS (-DC_CORE)
CMAKE: Clarify CMakeLists.txt a bit
2011-02-24 11:14:59 +00:00
ENDIF( NOT ENABLE_ASM_CORE )
Fixing file.
2008-06-06 10:17:20 +00:00
GTK: NLS support WIP
2011-02-24 13:06:17 +00:00
# Enable internationalization
if( ENABLE_NLS )
GTK: More NLS WIP
2011-02-24 17:01:10 +00:00
SET( LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale )
ADD_DEFINITIONS ( -DENABLE_NLS )
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_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
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
IF(APPLE)
# use Homebrew gettext if available
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()
all current vba-m Wx patches applied to trunk.
2011-05-25 11:55:46 +00:00
IF(ENABLE_LINK)
FIND_PATH(LIBINTL_INC libintl.h )
FIND_LIBRARY(LIBINTL_LIB intl )
cmake fixes -Whitespace fixes -Binaries installation fixes
2016-12-10 23:27:18 +00:00
IF(LIBINTL_LIB)
all current vba-m Wx patches applied to trunk.
2011-05-25 11:55:46 +00:00
SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${LIBINTL_LIB})
SET(VBAMCORE_LIBS ${VBAMCORE_LIBS} ${LIBINTL_LIB})
cmake fixes -Whitespace fixes -Binaries installation fixes
2016-12-10 23:27:18 +00:00
ENDIF(LIBINTL_LIB)
all current vba-m Wx patches applied to trunk.
2011-05-25 11:55:46 +00:00
INCLUDE(CheckFunctionExists)
CHECK_FUNCTION_EXISTS(gettext GETTEXT_FN)
IF(NOT LIBINTL_INC OR NOT GETTEXT_FN)
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
MESSAGE(FATAL_ERROR "NLS requires libintl/gettext")
all current vba-m Wx patches applied to trunk.
2011-05-25 11:55:46 +00:00
ENDIF(NOT LIBINTL_INC OR NOT GETTEXT_FN)
INCLUDE_DIRECTORIES(${LIBINTL_INC})
ENDIF(ENABLE_LINK)
GTK: NLS support WIP
2011-02-24 13:06:17 +00:00
endif( ENABLE_NLS )
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
# Win32 deps submodule
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
IF(WIN32)
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
IF(NOT EXISTS "${CMAKE_SOURCE_DIR}/dependencies" AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
MESSAGE(FATAL_ERROR "Please pull in git submodules, e.g. run: git submodule update --init --recursive")
ENDIF()
INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/dependencies/include")
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
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
# Compiler flags
IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
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
SET(LTO_FLAG "")
IF(ENABLE_LTO)
IF(CMAKE_COMPILER_IS_GNUCXX)
SET(LTO_FLAG -flto=10)
ELSE()
SET(LTO_FLAG -flto)
ENDIF()
ENDIF(ENABLE_LTO)
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 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
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
SET(MY_C_AND_CXX_OPT_FLAGS -O2 -mtune=generic -fomit-frame-pointer ${LTO_FLAG})
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
IF(CMAKE_COMPILER_IS_GNUCXX)
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
SET(MY_C_AND_CXX_DBG_FLAGS -ggdb3 -Og)
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
ELSE()
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
SET(MY_C_AND_CXX_DBG_FLAGS -g)
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
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
# common flags
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
SET(MY_C_AND_CXX_FLAGS -pipe -fPIC -Wformat -Wformat-security -fstack-protector-strong --param ssp-buffer-size=4 -fexceptions -D_FORTIFY_SOURCE=2 -feliminate-unused-debug-types)
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
SET(MY_C_FLAGS ${MY_C_FLAGS} ${MY_C_AND_CXX_FLAGS})
SET(MY_CXX_FLAGS ${MY_CXX_FLAGS} ${MY_C_AND_CXX_FLAGS})
IF(MINGW)
SET(MY_C_FLAGS ${MY_C_FLAGS} -static-libgcc)
SET(MY_CXX_FLAGS ${MY_CXX_FLAGS} -static-libgcc -static-libstdc++)
ENDIF(MINGW)
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
IF(CMAKE_BUILD_TYPE STREQUAL Debug)
SET(MY_C_FLAGS ${MY_C_FLAGS} ${MY_C_AND_CXX_DBG_FLAGS} -Wall)
SET(MY_CXX_FLAGS ${MY_CXX_FLAGS} ${MY_C_AND_CXX_DBG_FLAGS} -Wall)
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
ELSE()
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
SET(MY_C_FLAGS ${MY_C_FLAGS} ${MY_C_AND_CXX_OPT_FLAGS} -Wno-error)
SET(MY_CXX_FLAGS ${MY_CXX_FLAGS} ${MY_C_AND_CXX_OPT_FLAGS} -Wno-error)
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
ENDIF()
FOREACH(C_COMPILE_FLAG ${MY_C_FLAGS})
ADD_COMPILE_OPTIONS($<$<COMPILE_LANGUAGE:C>:${C_COMPILE_FLAG}>)
ENDFOREACH()
FOREACH(CXX_COMPILE_FLAG ${MY_CXX_FLAGS})
ADD_COMPILE_OPTIONS($<$<COMPILE_LANGUAGE:CXX>:${CXX_COMPILE_FLAG}>)
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
# make a string of compile options to add to link flags
UNSET(C_COMPILE_FLAGS_STR)
UNSET(CXX_COMPILE_FLAGS_STR)
FOREACH(ARG ${MY_C_FLAGS})
SET(C_COMPILE_FLAGS_STR "${C_COMPILE_FLAGS_STR} ${ARG}")
ENDFOREACH()
FOREACH(ARG ${MY_CXX_FLAGS})
SET(CXX_COMPILE_FLAGS_STR "${CXX_COMPILE_FLAGS_STR} ${ARG}")
ENDFOREACH()
# need all flags for linking, because of -flto etc.
SET(CMAKE_C_LINK_EXECUTABLE "${CMAKE_C_LINK_EXECUTABLE} ${C_COMPILE_FLAGS_STR}")
SET(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} ${CXX_COMPILE_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
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
IF(CMAKE_COMPILER_IS_GNUCXX)
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
INCLUDE(UseGCCBinUtilsWrappers)
IF(WIN32)
SET(SSP_STATIC ON)
ENDIF(WIN32)
FIND_PACKAGE(SSP)
IF(SSP_LIBRARY)
SET(CMAKE_C_LINK_EXECUTABLE "${CMAKE_C_LINK_EXECUTABLE} ${SSP_LIBRARY}")
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
SET(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} ${SSP_LIBRARY}")
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
ENDIF(SSP_LIBRARY)
SET(CMAKE_C_LINK_EXECUTABLE "${CMAKE_C_LINK_EXECUTABLE} -Wl,-allow-multiple-definition")
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
SET(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -Wl,-allow-multiple-definition")
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
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
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
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
IF(ASM_ENABLED)
FOREACH(ASM_FLAG -I${CMAKE_SOURCE_DIR}/src/filters/hq/asm/ -O1 -w-orphan-labels)
ADD_COMPILE_OPTIONS($<$<COMPILE_LANGUAGE:ASM_NASM>:${ASM_FLAG}>)
ENDFOREACH()
ENDIF(ASM_ENABLED)
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 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
IF(AMD64)
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_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
Fixing file.
2008-06-06 10:17:20 +00:00
SET(SRC_MAIN
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
)
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
SET(HDR_MAIN
src/AutoBuild.h
src/System.h
src/Util.h
src/version.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
)
buncha patches by darktjm sdl fix not applied yet
2011-05-24 07:39:29 +00:00
if(ENABLE_FFMPEG)
SET(SRC_MAIN ${SRC_MAIN} src/common/ffmpeg.cpp)
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
SET(HDR_MAIN ${HDR_MAIN} src/common/ffmpeg.h)
buncha patches by darktjm sdl fix not applied yet
2011-05-24 07:39:29 +00:00
endif(ENABLE_FFMPEG)
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)
SET(HDR_MAIN ${HDR_MAIN} src/NLS.h)
endif(ENABLE_NLS)
No more cryptic names ...
2009-01-01 15:20:03 +00:00
SET(SRC_GBA
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
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/BreakpointStructures.cpp
Moved more GBA specific code to the gba folder.
2009-01-01 16:11:02 +00:00
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
)
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
SET(HDR_GBA
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
)
No need to use cryptic names
2009-01-01 14:52:03 +00:00
SET(SRC_GB
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
)
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
SET(HDR_GB
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
)
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
SET(SRC_APU
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
)
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
SET(HDR_APU
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
)
Fixing file.
2008-06-06 10:17:20 +00:00
SET(SRC_SDL
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
Fixing file.
2008-06-06 10:17:20 +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
SET(HDR_SDL
src/sdl/filters.h
src/sdl/text.h
src/sdl/inputSDL.h
src/sdl/expr.cpp.h
src/sdl/exprNode.h
)
Moved the filters to their own directory.
2009-01-01 13:02:35 +00:00
SET(SRC_FILTERS
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
)
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
SET(HDR_FILTERS
src/filters/hq2x.h
src/filters/interp.h
src/filters/lq2x.h
src/filters/xBRZ/config.h
src/filters/xBRZ/xbrz.h
)
Fixing file.
2008-06-06 10:17:20 +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
)
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
SET(HDR_HQ_C
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
)
Fixing file.
2008-06-06 10:17:20 +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
)
all current vba-m Wx patches applied to trunk.
2011-05-25 11:55:46 +00:00
if( ENABLE_ASM_SCALERS )
SET(SRC_FILTERS ${SRC_FILTERS} ${SRC_HQ_ASM})
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_MMX)
SET(SRC_FILTERS ${SRC_FILTERS} src/filters/2xSaImmx.asm)
ENDIF(ENABLE_MMX)
all current vba-m Wx patches applied to trunk.
2011-05-25 11:55:46 +00:00
else( ENABLE_ASM_SCALERS )
SET(SRC_FILTERS ${SRC_FILTERS} ${SRC_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
SET(HDR_FILTERS ${HDR_FILTERS} ${HDR_HQ_C})
all current vba-m Wx patches applied to trunk.
2011-05-25 11:55:46 +00:00
ADD_DEFINITIONS ( -DNO_ASM )
endif( ENABLE_ASM_SCALERS )
CMAKE: Clarify CMakeLists.txt a bit
2011-02-24 11:14:59 +00:00
if( ENABLE_DEBUGGER )
Allow building the GTK port without debugger support
2008-06-16 20:18:49 +00:00
SET(SRC_DEBUGGER
Moved more GBA specific code to the gba folder.
2009-01-01 16:11:02 +00:00
src/gba/armdis.cpp
src/gba/elf.cpp
src/gba/remote.cpp
Allow building the GTK port without debugger support
2008-06-16 20:18:49 +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
SET(HDR_DEBUGGER
src/gba/armdis.h
src/gba/elf.h
src/gba/remote.h
)
CMAKE: Clarify CMakeLists.txt a bit
2011-02-24 11:14:59 +00:00
endif( ENABLE_DEBUGGER )
Allow building the GTK port without debugger support
2008-06-16 20:18:49 +00:00
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
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
FIXED: Added PNG include dir
2008-10-20 16:30:07 +00:00
${PNG_INCLUDE_DIR}
<wip> Migration to SDL2 made possible by galtgendo, gtk changes to follow.
2015-11-19 02:34:38 +00:00
${SDL2_INCLUDE_DIR}
Fixing file.
2008-06-06 10:17:20 +00:00
)
Added support for detected FFMPEG include path
2012-05-23 06:19:44 +00:00
IF( ENABLE_FFMPEG )
INCLUDE_DIRECTORIES(
${FFMPEG_INCLUDE_DIRS}
)
ENDIF( ENABLE_FFMPEG )
Fixing file.
2008-06-06 10:17:20 +00:00
ADD_LIBRARY (
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}
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 vbamcore PROPERTY CXX_STANDARD 11)
set_property(TARGET vbamcore PROPERTY CXX_STANDARD_REQUIRED ON)
Fixing file.
2008-06-06 10:17:20 +00:00
CMAKE: Clarify CMakeLists.txt a bit
2011-02-24 11:14:59 +00:00
IF( ENABLE_SDL )
Fixing file.
2008-06-06 10:17:20 +00:00
ADD_EXECUTABLE (
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
Fixed CMake for cross-compiling
2008-06-06 16:42:31 +00:00
IF( WIN32 )
SET( WIN32_LIBRARIES wsock32 )
ENDIF( WIN32 )
CMAKE: Clarify CMakeLists.txt a bit
2011-02-24 11:14:59 +00:00
IF( ENABLE_LIRC )
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
SET( LIRC_CLIENT_LIBRARY lirc_client )
CMAKE: Clarify CMakeLists.txt a bit
2011-02-24 11:14:59 +00:00
ENDIF( ENABLE_LIRC )
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
Fixing file.
2008-06-06 10:17:20 +00:00
TARGET_LINK_LIBRARIES (
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 fixes -Whitespace fixes -Binaries installation fixes
2016-12-10 23:27:18 +00:00
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vbam DESTINATION bin)
IF( WIN32 )
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example
DESTINATION ${CMAKE_INSTALL_PREFIX}/${SYSCONF_INSTALL_DIR}
RENAME vbam.cfg)
ELSE( WIN32 )
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example
DESTINATION ${SYSCONF_INSTALL_DIR}
RENAME vbam.cfg)
ENDIF( WIN32 )
CMAKE: Clarify CMakeLists.txt a bit
2011-02-24 11:14:59 +00:00
ENDIF( ENABLE_SDL )
Fixing file.
2008-06-06 10:17:20 +00:00
<wip> Migration to SDL2 made possible by galtgendo, gtk changes to follow.
2015-11-19 02:34:38 +00:00
IF( ENABLE_GTK OR ENABLE_GTK3 )
cmake fixes -Whitespace fixes -Binaries installation fixes
2016-12-10 23:27:18 +00:00
add_subdirectory (src/gtk)
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/gvbam${CMAKE_EXECUTABLE_SUFFIX} DESTINATION bin)
<wip> Migration to SDL2 made possible by galtgendo, gtk changes to follow.
2015-11-19 02:34:38 +00:00
ENDIF( ENABLE_GTK OR ENABLE_GTK3 )
all current vba-m Wx patches applied to trunk.
2011-05-25 11:55:46 +00:00
IF( ENABLE_WX )
add_subdirectory(src/wx)
cmake fixes -Whitespace fixes -Binaries installation fixes
2016-12-10 23:27:18 +00:00
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/visualboyadvance-m${CMAKE_EXECUTABLE_SUFFIX} DESTINATION bin)
all current vba-m Wx patches applied to trunk.
2011-05-25 11:55:46 +00:00
ENDIF( ENABLE_WX )
<wip> Migration to SDL2 made possible by galtgendo, gtk changes to follow.
2015-11-19 02:34:38 +00:00
if( ENABLE_GTK OR ENABLE_GTK3 OR ENABLE_WX )
GTK: More NLS WIP
2011-02-24 17:46:59 +00:00
# Native Language Support
if( ENABLE_NLS )
add_subdirectory(po)
endif( ENABLE_NLS )
<wip> Migration to SDL2 made possible by galtgendo, gtk changes to follow.
2015-11-19 02:34:38 +00:00
endif( ENABLE_GTK OR ENABLE_GTK3 OR ENABLE_WX )
cmakelists changes, wxwidgets interface build fix to follow.
2015-03-27 17:48:42 +00:00
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/vba-over.ini DESTINATION ${DATA_INSTALL_DIR})
IF(NOT APPLE)
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/icons/ DESTINATION share/icons/hicolor PATTERN ".svn" EXCLUDE)
Just added a small cpack routine to make a zip file of the binaries.
2015-04-05 04:28:40 +00:00
ENDIF(NOT APPLE)
Installed man pages on unix-ish platforms. Patch by Mook.
2015-05-18 00:28:34 +00:00
# manual pages
IF( UNIX )
cmake fixes -Whitespace fixes -Binaries installation fixes
2016-12-10 23:27:18 +00:00
IF( ENABLE_SDL )
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/vbam.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6)
ENDIF( ENABLE_SDL )
Manpage fixes
2016-12-10 22:50:27 +00:00
IF( ENABLE_GTK OR ENABLE_GTK3 )
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/gvbam.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6)
ENDIF( ENABLE_GTK OR ENABLE_GTK3 )
Installed man pages on unix-ish platforms. Patch by Mook.
2015-05-18 00:28:34 +00:00
IF( ENABLE_WX )
Manpage fixes
2016-12-10 22:50:27 +00:00
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/debian/visualboyadvance-m.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6)
Installed man pages on unix-ish platforms. Patch by Mook.
2015-05-18 00:28:34 +00:00
ENDIF( ENABLE_WX )
ENDIF( UNIX )
Add linux appdata and fixes Desktop files aren't installed for linux by default
2016-12-10 23:33:01 +00:00
# linux data files
IF( NOT WIN32 AND NOT APPLE )
IF( ENABLE_GTK OR ENABLE_GTK3 )
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/gvbam.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/gvbam.appdata.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/appdata)
ENDIF( ENABLE_GTK OR ENABLE_GTK3 )
IF( ENABLE_WX )
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/wx/wxvbam.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/wx/wxvbam.appdata.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/appdata)
ENDIF( ENABLE_WX )
ENDIF( NOT WIN32 AND NOT APPLE )
Just added a small cpack routine to make a zip file of the binaries.
2015-04-05 04:28:40 +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")
You didn't see us change the version to 2.0.0 *waves hands mysteriously*
2015-05-18 02:41:21 +00:00
SET(CPACK_PACKAGE_VERSION_MAJOR "2")
SET(CPACK_PACKAGE_VERSION_MINOR "0")
rename exe and added more cpack stuff.
2015-06-15 13:00:47 +00:00
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")
Installed man pages on unix-ish platforms. Patch by Mook.
2015-05-18 00:28:34 +00:00
INCLUDE(CPack)