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

support FreeBSD 

Make some changes to support out-of-the-box builds on FreeBSD:

- set cmake OpenGL type to `LEGACY`, the new `GLVND` type produces
  unusable binaries on FreeBSD

- on FreeBSD add -I/usr/local/include to compiler flags, why this is
  necessary I don't know

- look for llvm tools such as `llvm-ar` in `/usr/local/llvm-devel/bin`,
  LTO works

- improve the `find_wx_util()` cmake function to handle `wx-config`
  scripts named in the form e.g. `wxgtk3u-3.1-config`

- add FreeBSD support to `installdeps`

- make some minor changes to included headers based on macros such as
  `__FreeBSD__` to compile on FreeBSD, including adding a `BSD.h` header
  with some defines for e.g. `fseeko64`

- move the cmake X11 detection to before the wx compile tests, because
  otherwise the extra compile flags for the wx tests make the X11 tests
  fail

- make some minor changes to fix wx 2.8 compatibilty again, we don't
  actually use 2.8 for FreeBSD but I was testing it

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
Rafael Kitover 2019-04-25 16:22:07 +00:00
parent a0c375b6e4
commit 2fedaa63a6
No known key found for this signature in database
GPG Key ID: 08AB596679D86240
14 changed files with 110 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -118,7 +118,7 @@ set(LTO_DEFAULT ON)
# lto produces buggy binaries for 64 bit win32
# and we generally don't want it when debugging because it makes linking slow
if((WIN32 AND CMAKE_COMPILER_IS_GNUCXX AND AMD64) OR CMAKE_BUILD_TYPE MATCHES Debug)
if(CMAKE_BUILD_TYPE MATCHES Debug OR (WIN32 AND CMAKE_COMPILER_IS_GNUCXX AND AMD64))
set(LTO_DEFAULT OFF)
endif()
@ -198,7 +198,7 @@ endif()
# Look for some dependencies using CMake scripts
find_package(ZLIB REQUIRED)
set(OpenGL_GL_PREFERENCE GLVND)
set(OpenGL_GL_PREFERENCE LEGACY)
find_package(OpenGL REQUIRED)
@ -504,6 +504,11 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
set(MY_C_FLAGS ${MY_C_FLAGS} ${MY_C_OPT_FLAGS} -Wno-error)
endif()
# for some reason this is necessary
if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
set(MY_C_FLAGS -I/usr/local/include ${MY_C_FLAGS})
endif()
foreach(C_COMPILE_FLAG ${MY_C_FLAGS})
add_compile_options(${C_COMPILE_FLAG})
endforeach()

12
cmake/LLVMToolchain.cmake
View File

@ -14,6 +14,18 @@ function(use_llvm_toolchain)
OUTPUT_STRIP_TRAILING_WHITESPACE
)
# for FreeBSD
if(NOT prog_path MATCHES "^/")
get_filename_component(
abs_path ${prog_path} ABSOLUTE
BASE_DIR /usr/local/llvm-devel/bin
)
if(EXISTS ${abs_path})
set(prog_path ${abs_path})
endif()
endif()
if(prog_path MATCHES "^/")
if(tool STREQUAL ld)
set(tool linker)

18
cmake/VbamFunctions.cmake
View File

@ -70,16 +70,16 @@ endfunction()
function(find_wx_util var util)
# on win32, including cross builds we prefer the plain utility name first from PATH
if(WIN32)
set(conf_suffixes "" gtk4 gtk3)
set(conf_suffixes "" gtk4u gtk4 gtk3u gtk3 gtk2u gtk2)
set(major_versions "" 4 3 2)
else()
set(conf_suffixes gtk4 gtk3 "")
set(conf_suffixes gtk4u gtk4 gtk3u gtk3 gtk2u gtk2"")
set(major_versions 4 3 2 "")
endif()
foreach(conf_suffix IN LISTS conf_suffixes)
foreach(major_version IN LISTS major_versions)
foreach(minor_version RANGE 100 0 -1)
foreach(minor_version RANGE 100 -1 -1)
unset(suffix)
if(conf_suffix)
set(suffix "-${conf_suffix}")
@ -87,7 +87,7 @@ function(find_wx_util var util)
if(major_version)
set(suffix "${suffix}-${major_version}")
if(NOT minor_version EQUAL 0)
if(NOT minor_version EQUAL -1)
set(suffix "${suffix}.${minor_version}")
endif()
endif()
@ -96,6 +96,16 @@ function(find_wx_util var util)
set(exe NOTFOUND CACHE INTERNAL "" FORCE)
find_program(exe NAMES "${util}${suffix}")
# try infix variant, as on FreeBSD
if(NOT EXISTS ${exe})
string(REGEX REPLACE "^-" "" suffix "${suffix}")
string(REGEX REPLACE "-" "${suffix}-" try ${util})
set(exe NOTFOUND CACHE INTERNAL "" FORCE)
find_program(exe NAMES ${try})
endif()
if(EXISTS ${exe})
# check that the utility can be executed cleanly
# in case we find e.g. the wrong architecture binary

18
installdeps
View File

@ -45,6 +45,9 @@ check_os() {
Darwin)
os=mac
;;
FreeBSD)
os=freebsd
;;
MINGW*|MSYS*)
os=windows
;;
@ -174,6 +177,17 @@ linux_installdeps() {
fi
}
freebsd_installdeps() {
installing
check sudo pkg update
# currently the wx30 and wx31 packages produce GTK errors on CURRENT (as of 04/2019)
check sudo pkg install -y llvm-devel cmake ccache nasm ffmpeg gettext-tools gettext png pkgconf sdl2 sfml wx31-gtk3 iconv zip ninja
build_instructions
}
# the -j flag for make parameter, empty if 1
jobs_flag() {
if [ $(num_cpus) -gt 1 ]; then
@ -197,7 +211,7 @@ num_cpus() {
_num_cpus=$(nproc)
elif [ $os = linux -o $os = windows ]; then
_num_cpus=$(grep '^processor *:' /proc/cpuinfo | wc -l)
elif [ $os = mac ]; then
elif [ $os = mac ] || [ $os = freebsd ]; then
_num_cpus=$(sysctl -n hw.ncpu)
fi
@ -1055,7 +1069,7 @@ macports_installdeps() {
installing
check sudo port -v selfupdate
check sudo port -v install cmake ccache nasm ffmpeg gettext libpng pkgconfig libsdl2 sfml wxWidgets-3.0 libiconv ccache
check sudo port -v install cmake ccache nasm ffmpeg gettext libpng pkgconfig libsdl2 sfml wxWidgets-3.0 libiconv
check sudo port select wxWidgets wxWidgets-3.0
build_instructions

11
src/common/BSD.h Normal file
View File

@ -0,0 +1,11 @@
#ifndef VBAM_BSD_H
#define VBAM_BSD_H
#define fopen64 fopen
#define fseeko64 fseeko
#define fseek64 fseek
#define ftell64 ftell
#define ftello64 ftello
#endif // VBAM_BSD_H

1
src/common/ConfigManager.cpp
View File

@ -16,6 +16,7 @@ extern "C" {
#include <sys/stat.h>
#include <cmath>
#include <cerrno>
#include <unistd.h>
#include "../common/Patch.h"
#include "../common/ConfigManager.h"

8
src/common/Patch.cpp
View File

@ -7,12 +7,14 @@
#include "Patch.h"
#if defined(__FreeBSD__) || defined(__NetBSD__)
#include <sys/param.h>
#include "BSD.h"
#endif
#ifndef __LIBRETRO__
#ifdef __GNUC__
#if defined(BSD) || defined(__NetBSD__)
#include <sys/param.h>
#endif
#if defined(__APPLE__) || defined(BSD) || defined(__NetBSD__)
typedef off_t __off64_t; /* off_t is 64 bits on BSD. */
#define fseeko64 fseeko

4
src/gba/GBALink.cpp
View File

@ -3,8 +3,8 @@
#include <stdio.h>
#include <string.h>
// malloc.h does not seem to exist on Mac OS 10.7
#ifdef __APPLE__
// malloc.h does not seem to exist on Mac OS 10.7 and is an error on FreeBSD
#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
#include <stdlib.h>
#else
#include <malloc.h>

36
src/wx/CMakeLists.txt
View File

@ -63,6 +63,18 @@ if(ENABLE_FAUDIO)
set(FAUDIO_LIBS FAudio)
endif()
# on unix we have to check for X11 before we overwrite all the compile/link
# flags with the wx tests
if(NOT WIN32 AND NOT APPLE)
find_package(X11)
if(X11_X11_LIB AND X11_Xscreensaver_LIB)
include_directories(${X11_INCLUDE_DIR})
set(EXTRA_X11_LIBS ${X11_X11_LIB} ${X11_Xscreensaver_LIB})
add_definitions(-DHAVE_XSS)
endif()
endif()
# on VS with vcpkg we can't use FindwxWidgets, we have to set everything up
# manually because the package is broken
if(WIN32 AND CMAKE_TOOLCHAIN_FILE MATCHES vcpkg AND (X86_32 OR AMD64))
@ -193,7 +205,19 @@ else()
set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_FLAGS} ${CMAKE_REQUIRED_DEFINITIONS})
# find the right C++ ABI version for wxWidgets, this is also necessary for the OpenGL check following
if((CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL Clang) AND NOT CMAKE_CROSSCOMPILING)
# on FreeBSD the ABI check segfaults and always fails, and we don't
# need it because everything is built with clang
set(ABI_CHECK FALSE)
if((CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
AND NOT CMAKE_CROSSCOMPILING
AND NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
set(ABI_CHECK TRUE)
endif()
if(ABI_CHECK)
set(WX_ABI_FOUND_MATCH FALSE)
include(CheckCXXSourceRuns)
@ -691,16 +715,6 @@ if(WIN32)
endif()
endif()
if(NOT WIN32 AND NOT APPLE)
find_package(X11)
if(X11_X11_LIB AND X11_Xscreensaver_LIB)
include_directories(${X11_INCLUDE_DIR})
set(EXTRA_X11_LIBS ${X11_X11_LIB} ${X11_Xscreensaver_LIB})
add_definitions(-DHAVE_XSS)
endif()
endif()
link_directories(${CMAKE_BINARY_DIR})
set(VBAM_ICON vbam.icns)

5
src/wx/guiinit.cpp
View File

@ -7,6 +7,7 @@
#include "wxvbam.h"
#include <cmath>
#include <algorithm>
#include <stdexcept>
#include <typeinfo>
@ -89,7 +90,7 @@ public:
return;
if (!server) {
bool valid = SetLinkServerHost(gopts.link_host.c_str());
bool valid = SetLinkServerHost(gopts.link_host.utf8_str());
if (!valid) {
wxMessageBox(_("You must enter a valid host name"),
@ -3835,7 +3836,7 @@ bool MainFrame::BindControls()
bool isv = !gopts.link_host.empty();
if (isv) {
isv = SetLinkServerHost(gopts.link_host.c_str());
isv = SetLinkServerHost(gopts.link_host.utf8_str());
}
if (!isv) {

6
src/wx/opts.h
View File

@ -103,10 +103,10 @@ extern struct opt_desc {
} opts[];
// Initializer for struct opt_desc
opt_desc new_opt_desc(wxString opt = "", const char* cmd = NULL, wxString desc = "",
wxString* stropt = NULL, int* intopt = NULL, wxString enumvals = "",
opt_desc new_opt_desc(wxString opt = wxT(""), const char* cmd = NULL, wxString desc = wxT(""),
wxString* stropt = NULL, int* intopt = NULL, wxString enumvals = wxT(""),
double min = 0, double max = 0, bool* boolopt = NULL,
double* doubleopt = NULL, uint32_t* uintopt = NULL, wxString curstr = "",
double* doubleopt = NULL, uint32_t* uintopt = NULL, wxString curstr = wxT(""),
int curint = 0, double curdouble = 0, uint32_t curuint = 0);
extern const int num_opts;

4
src/wx/panel.cpp
View File

@ -1051,8 +1051,10 @@ void GameArea::OnIdle(wxIdleEvent& event)
#endif
Layout();
SendSizeEvent();
#if wxCHECK_VERSION(2, 9, 0)
SendSizeEvent();
#endif
if (pointer_blanked)
w->SetCursor(wxCursor(wxCURSOR_BLANK));

14
src/wx/wxvbam.cpp
View File

@ -479,32 +479,32 @@ void wxvbamApp::OnInitCmdLine(wxCmdLineParser& cl)
static wxCmdLineEntryDesc opttab[] = {
{ wxCMD_LINE_OPTION, NULL, t("save-xrc"),
N_("Save built-in XRC file and exit"),
wxCMD_LINE_VAL_NONE, wxCMD_LINE_VAL_NONE },
wxCMD_LINE_VAL_STRING, 0 },
{ wxCMD_LINE_OPTION, NULL, t("save-over"),
N_("Save built-in vba-over.ini and exit"),
wxCMD_LINE_VAL_NONE, wxCMD_LINE_VAL_NONE },
wxCMD_LINE_VAL_STRING, 0 },
{ wxCMD_LINE_SWITCH, NULL, t("print-cfg-path"),
N_("Print configuration path and exit"),
wxCMD_LINE_VAL_NONE, wxCMD_LINE_VAL_NONE },
wxCMD_LINE_VAL_NONE, 0 },
{ wxCMD_LINE_SWITCH, t("f"), t("fullscreen"),
N_("Start in full-screen mode"),
wxCMD_LINE_VAL_NONE, wxCMD_LINE_VAL_NONE },
wxCMD_LINE_VAL_NONE, 0 },
#if !defined(NO_LINK) && !defined(__WXMSW__)
{ wxCMD_LINE_SWITCH, t("s"), t("delete-shared-state"),
N_("Delete shared link state first, if it exists"),
wxCMD_LINE_VAL_NONE, wxCMD_LINE_VAL_NONE },
wxCMD_LINE_VAL_NONE, 0 },
#endif
// stupid wx cmd line parser doesn't support duplicate options
// { wxCMD_LINE_OPTION, t("o"), t("option"),
// _("Set configuration option; <opt>=<value> or help for list"),
{ wxCMD_LINE_SWITCH, t("o"), t("list-options"),
N_("List all settable options and exit"),
wxCMD_LINE_VAL_NONE, wxCMD_LINE_VAL_NONE },
wxCMD_LINE_VAL_NONE, 0 },
{ wxCMD_LINE_PARAM, NULL, NULL,
N_("ROM file"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
{ wxCMD_LINE_PARAM, NULL, NULL,
N_("<config>=<value>"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_PARAM_OPTIONAL },
{ wxCMD_LINE_NONE, NULL, NULL, NULL, wxCMD_LINE_VAL_NONE, wxCMD_LINE_VAL_NONE }
{ wxCMD_LINE_NONE, NULL, NULL, NULL, wxCMD_LINE_VAL_NONE, 0 }
};
// 2.9 automatically translates desc, but 2.8 doesn't
#if !wxCHECK_VERSION(2, 9, 0)

2
src/wx/wxvbam.h
View File

@ -658,7 +658,7 @@ extern struct cmditem {
extern const int ncmds;
// Initializer for struct cmditem
cmditem new_cmditem(const wxString cmd = "", const wxString name = "",
cmditem new_cmditem(const wxString cmd = wxT(""), const wxString name = wxT(""),
int cmd_id = 0, int mask_flags = 0, wxMenuItem* mi = NULL);
// for binary search