WIP

visualboyadvance-m · Feb 20, 2018 · d8ef8d4 · d8ef8d4
1 parent 3e052c9
commit d8ef8d4
Show file tree

Hide file tree

Showing 19 changed files with 3,657 additions and 1,297 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/README.md b/README.md
@@ -136,8 +136,12 @@ Here is the complete list:
 | ENABLE_DIRECT3D       | Direct3D rendering for wxWidgets (Windows, **NOT IMPLEMENTED!!!**)   | ON                    |
 | ENABLE_XAUDIO2        | Enable xaudio2 sound output for wxWidgets (Windows only)             | ON                    |
 | ENABLE_OPENAL         | Enable OpenAL for the wxWidgets port                                 | ON                    |
-| SFML_STATIC_LIBRARIES | Set this to ON if linking static SFML libraries                      | OFF                   |
-| FFMPEG_STATIC         | Set this to ON if linking static ffmpeg librariesl                   | OFF                   |
+| VBAM_STATIC           | Try link all libs statically (the following are set to ON if ON)     | OFF                   |
+| SDL2_STATIC           | Try to link static SDL2 libraries                                    | OFF                   |
+| SFML_STATIC_LIBRARIES | Try to link static SFML libraries                                    | OFF                   |
+| FFMPEG_STATIC         | Try to link static ffmpeg libraries                                  | OFF                   |
+| SSP_STATIC            | Try to link static gcc stack protector library (gcc only)            | OFF except Win32      |
+| OPENAL_STATIC         | Try to link static OpenAL libraries                                  | OFF                   |
 
 Note for distro packagers, we use the CMake module
 [GNUInstallDirs](https://cmake.org/cmake/help/v2.8.12/cmake.html#module:GNUInstallDirs)

diff --git a/cmake/FindSSP.cmake b/cmake/FindSSP.cmake
@@ -52,9 +52,18 @@ IF(NOT (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUC))
     RETURN()
 ENDIF()
 
-GET_FILENAME_COMPONENT(GCC_DIRNAME ${CMAKE_C_COMPILER} DIRECTORY)
+foreach(arg ${CMAKE_C_COMPILER_ARG1} ${CMAKE_C_COMPILER_ARG2} ${CMAKE_C_COMPILER_ARG3} ${CMAKE_C_COMPILER_ARG4} ${CMAKE_C_COMPILER_ARG5} ${CMAKE_C_COMPILER_ARG6} ${CMAKE_C_COMPILER_ARG7} ${CMAKE_C_COMPILER_ARG8} ${CMAKE_C_COMPILER_ARG9})
+    string(STRIP ${arg} arg)
+    set(gcc_args "${gcc_args};${arg}")
+endforeach()
 
-EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} --print-libgcc-file-name OUTPUT_VARIABLE LIBGCC_FILE OUTPUT_STRIP_TRAILING_WHITESPACE)
+EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} ${gcc_args} --print-prog-name=gcc OUTPUT_VARIABLE GCC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+execute_process(COMMAND sh -c "command -v ${GCC_EXECUTABLE}" OUTPUT_VARIABLE GCC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+GET_FILENAME_COMPONENT(GCC_DIRNAME ${GCC_EXECUTABLE} DIRECTORY)
+
+EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} ${gcc_args} --print-libgcc-file-name OUTPUT_VARIABLE LIBGCC_FILE OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 GET_FILENAME_COMPONENT(LIBGCC_DIRNAME ${LIBGCC_FILE} DIRECTORY)
 

diff --git a/cmake/Toolchain-cross-MinGW-w64-i686.cmake b/cmake/Toolchain-cross-MinGW-w64-i686.cmake
@@ -9,6 +9,10 @@ find_program(CMAKE_CXX_COMPILER NAMES ${COMPILER_PREFIX}-g++)
 
 SET(CMAKE_FIND_ROOT_PATH /usr/${COMPILER_PREFIX} /usr/${COMPILER_PREFIX}/sys-root/mingw)
 
+if(CMAKE_PREFIX_PATH)
+    set(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH} ${CMAKE_PREFIX_PATH})
+endif()
+
 # adjust the default behaviour of the FIND_XXX() commands:
 # search headers and libraries in the target environment, search
 # programs in the host environment too

diff --git a/cmake/Toolchain-cross-MinGW-w64-x86_64.cmake b/cmake/Toolchain-cross-MinGW-w64-x86_64.cmake
@@ -9,6 +9,10 @@ find_program(CMAKE_CXX_COMPILER NAMES ${COMPILER_PREFIX}-g++)
 
 SET(CMAKE_FIND_ROOT_PATH /usr/${COMPILER_PREFIX} /usr/${COMPILER_PREFIX}/sys-root/mingw)
 
+if(CMAKE_PREFIX_PATH)
+    set(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH} ${CMAKE_PREFIX_PATH})
+endif()
+
 # adjust the default behaviour of the FIND_XXX() commands:
 # search headers and libraries in the target environment, search 
 # programs in the host environment too

diff --git a/installdeps b/installdeps
@@ -159,6 +159,8 @@ linux_installdeps() {
         archlinux_installdeps
     elif [ -f /etc/solus-release ]; then
         solus_installdeps
+    elif path_exists /etc/os-release && [ "$(. /etc/os-release; puts "$ID_LIKE")" = suse ]; then
+        suse_installdeps
     else
         error "Don't know how to install deps on your version of Linux"
     fi
@@ -488,6 +490,16 @@ fedora_installdeps() {
     build_instructions
 }
 
+suse_installdeps() {
+    check_cross
+    installing
+
+    check sudo zypper in -y gcc gcc-c++ binutils make cmake nasm ffmpeg2-devel gettext-tools libpng16-devel \
+                            pkg-config libSDL2-devel sfml2-devel wxWidgets-3_0-devel
+
+    build_instructions
+}
+
 archlinux_require_yaourt() {
     if ! command -v yaourt >/dev/null; then
         (

diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt
@@ -31,7 +31,7 @@ if(ENABLE_OPENAL)
     FIND_PACKAGE(OpenAL REQUIRED)
     INCLUDE_DIRECTORIES(${OPENAL_INCLUDE_DIR})
 
-    IF(WIN32 AND ((NOT (MINGW AND MSYS)) OR CMAKE_TOOLCHAIN_FILE MATCHES mxe))
+    IF(OPENAL_STATIC OR (WIN32 AND ((NOT (MINGW AND MSYS)) OR CMAKE_TOOLCHAIN_FILE MATCHES mxe)))
         ADD_DEFINITIONS(-DAL_LIBTYPE_STATIC)
     ENDIF()
 else(ENABLE_OPENAL)
@@ -42,6 +42,33 @@ IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
     SET(wxWidgets_USE_DEBUG ON) # noop if wx is compiled with --disable-debug, like in Mac Homebrew atm
 ENDIF()
 
+# on e.g. msys2 add a couple of libraries wx needs
+#if(WIN32 AND (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL Clang))
+#    set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -luuid -lwinspool")
+#endif()
+
+# convert msys paths like /c/foo to windows paths like c:/foo
+# for variables set by FindWxWidgets
+function(normalize_wx_paths)
+    if(MSYS)
+        unset(new_paths)
+        foreach(p ${wxWidgets_LIBRARY_DIRS})
+            execute_process(COMMAND cygpath -m "${p}" OUTPUT_VARIABLE p_win OUTPUT_STRIP_TRAILING_WHITESPACE)
+            list(APPEND new_paths "${p_win}")
+        endforeach()
+
+        set(wxWidgets_LIBRARY_DIRS ${new_paths} PARENT_SCOPE)
+
+        string(REGEX REPLACE "((^| )[^/]*)/([a-zA-Z])/" "\\1\\3:/" new_libs "${wxWidgets_LIBRARIES}")
+
+        set(wxWidgets_LIBRARIES ${new_libs} PARENT_SCOPE)
+    endif()
+endfunction()
+
+if(CMAKE_PREFIX_PATH)
+    set(wxWidgets_CONFIG_OPTIONS "--prefix=${CMAKE_PREFIX_PATH}")
+endif()
+
 SET(wxWidgets_USE_UNICODE ON)
 # adv is for wxAboutBox
 # xml, html is for xrc
@@ -51,6 +78,7 @@ SET(wxWidgets_USE_LIBS xrc xml html adv gl net core base gl)
 # the gl lib may not be available, and if it looks like it is we still have to
 # do a compile test later
 FIND_PACKAGE(wxWidgets QUIET)
+normalize_wx_paths()
 
 SET(CHECK_WX_OPENGL FALSE)
 
@@ -116,6 +144,7 @@ IF(NOT WX_HAS_OPENGL)
     ADD_DEFINITIONS(-DNO_OGL)
     LIST(REMOVE_ITEM wxWidgets_USE_LIBS gl)
     FIND_PACKAGE(wxWidgets REQUIRED)
+    normalize_wx_paths()
 ENDIF()
 
 IF(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_CROSSCOMPILING)
@@ -268,8 +297,19 @@ IF(NOT WIN32 AND NOT APPLE)
     SET(WX_CONFIG_H "${WX_CONFIG_H}/wx/config.h")
 
     INCLUDE(CheckCXXSymbolExists)
+    CHECK_CXX_SYMBOL_EXISTS(__WXGTK4__ ${WX_CONFIG_H} WX_USING_GTK4)
     CHECK_CXX_SYMBOL_EXISTS(__WXGTK3__ ${WX_CONFIG_H} WX_USING_GTK3)
-    IF(WX_USING_GTK3)
+    IF(WX_USING_GTK4)
+        FIND_PACKAGE(PkgConfig REQUIRED)
+        PKG_CHECK_MODULES(GTK4 REQUIRED gtk+-4.0)
+        IF(NOT GTK4_INCLUDE_DIRS)
+            MESSAGE(FATAL_ERROR "Could not find gtk4")
+        ENDIF()
+        INCLUDE_DIRECTORIES(${GTK4_INCLUDE_DIRS})
+        LINK_DIRECTORIES(${GTK4_LIBRARY_DIRS})
+        ADD_COMPILE_OPTIONS(${GTK4_CFLAGS_OTHER})
+        SET(GTK_LIBRARIES ${GTK4_LIBRARIES})
+    ELSEIF(WX_USING_GTK3)
         FIND_PACKAGE(PkgConfig REQUIRED)
         PKG_CHECK_MODULES(GTK3 REQUIRED gtk+-3.0)
         IF(NOT GTK3_INCLUDE_DIRS)
@@ -367,10 +407,17 @@ INCLUDE(HostCompile)
 
 HOST_COMPILE(${CMAKE_CURRENT_SOURCE_DIR}/bin2c.c ${BIN2C})
 
+if(WXRC)
+    separate_arguments(WXRC UNIX_COMMAND "${WXRC}")
+else()
+    set(WXRC wxrc)
+endif()
+
 ADD_CUSTOM_COMMAND(OUTPUT wxvbam.xrs
                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                   COMMAND wxrc ${XRC_SOURCES} -o wxvbam.xrs
+                   COMMAND ${WXRC} ${XRC_SOURCES} "--output=wxvbam.xrs"
                    DEPENDS ${XRC_SOURCES})
+
 ADD_CUSTOM_COMMAND(OUTPUT builtin-xrc.h
                    COMMAND ${BIN2C} wxvbam.xrs builtin-xrc.h builtin_xrs
                    DEPENDS wxvbam.xrs)
@@ -520,12 +567,39 @@ if(ENABLE_FFMPEG)
         visualboyadvance-m
         PROPERTIES LINK_FLAGS ${FFMPEG_LDFLAGS_STR}
     )
-endif(ENABLE_FFMPEG)
-
-# Build a console app in debug mode on Windows
-IF(WIN32 AND CMAKE_BUILD_TYPE STREQUAL Debug)
-    SET(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -Wl,--subsystem,console")
-ENDIF()
+endif()
+
+# link libgcc/libstdc++ statically on mingw
+# and adjust link command when making a static binary
+if(CMAKE_COMPILER_IS_GNUCXX)
+    if(WIN32)
+        # Build a console app in debug mode on Windows
+        if(CMAKE_BUILD_TYPE STREQUAL Debug)
+            set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -Wl,--subsystem,console")
+        else()
+            set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -Wl,--subsystem,windows")
+        endif()
+    endif()
+
+    if(VBAM_STATIC)
+        # some dists don't have a static libpthread
+        set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lpthread ")
+
+        if(WIN32)
+            add_custom_command(
+                TARGET visualboyadvance-m PRE_LINK
+                COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/msys-link-static.cmake
+                WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+            )
+        else()
+            add_custom_command(
+                TARGET visualboyadvance-m PRE_LINK
+                COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/link-static.cmake
+                WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+            )
+        endif()
+    endif()
+endif()
 
 IF(WIN32)
     INSTALL(PROGRAMS ${PROJECT_BINARY_DIR}/visualboyadvance-m${CMAKE_EXECUTABLE_SUFFIX} DESTINATION ${CMAKE_BINARY_DIR})

diff --git a/src/wx/guiinit.cpp b/src/wx/guiinit.cpp
@@ -2536,8 +2536,8 @@ void MainFrame::MenuOptionIntRadioValue(const char* menuName, int& field, int va
 // app-specific volume controls.
 
 #ifdef __WXMSW__
-    #include <Windows.h>
-    #include <CommCtrl.h>
+    #include <windows.h>
+    #include <commctrl.h>
     #include <wx/msw/private.h>
     typedef int (WINAPI *func_LoadIconWithScaleDown)(HINSTANCE, LPCWSTR, int, int, HICON*);
 #endif

diff --git a/src/wx/link-static.cmake b/src/wx/link-static.cmake
@@ -0,0 +1,5 @@
+file(READ CMakeFiles/visualboyadvance-m.dir/link.txt link_cmd)
+
+string(REGEX REPLACE "-l(z|expat|X[^ ]+|xcb[^ ]*) " "-Wl,--whole-archive -l\\1 -Wl,--no-whole-archive " link_cmd ${link_cmd})
+
+file(WRITE CMakeFiles/visualboyadvance-m.dir/link.txt ${link_cmd})
diff --git a/src/wx/msys-link-static.cmake b/src/wx/msys-link-static.cmake
@@ -0,0 +1,5 @@
+file(READ CMakeFiles/visualboyadvance-m.dir/linklibs.rsp link_libs)
+
+string(REPLACE "-Wl,-Bdynamic" "" link_libs ${link_libs})
+
+file(WRITE CMakeFiles/visualboyadvance-m.dir/linklibs.rsp ${link_libs})