fix devendor again and prepare for 0.4.2

This commit is contained in:
tildearrow 2022-01-18 02:09:47 -05:00
parent aaca180683
commit f652d6c738
3 changed files with 15 additions and 9 deletions

View File

@ -5,7 +5,7 @@ set(CMAKE_CXX_STANDARD 14)
set(CMAKE_PROJECT_VERSION_MAJOR 0)
set(CMAKE_PROJECT_VERSION_MINOR 4)
set(CMAKE_PROJECT_VERSION_PATCH 1)
set(CMAKE_PROJECT_VERSION_PATCH 2)
if (ANDROID)
set(BUILD_GUI OFF)
@ -32,9 +32,15 @@ if (NOT DEVENDOR_LIBRARIES)
endif()
if (DEVENDOR_LIBRARIES)
find_package(SDL REQUIRED)
set(HAVE_SDL2 ${SDL_LIBRARY})
include_directories(extern/imgui extern/IconFontCppHeaders extern/imgui/backends extern/igfd ${SDL_INCLUDE_DIR})
find_package(SDL)
if (SDL_FOUND)
set(HAVE_SDL2 ${SDL_LIBRARY})
include_directories(extern/imgui extern/IconFontCppHeaders extern/imgui/backends extern/igfd ${SDL_INCLUDE_DIR})
else()
find_package(SDL2 REQUIRED)
set(HAVE_SDL2 ${SDL2_LIBRARY})
include_directories(extern/imgui extern/IconFontCppHeaders extern/imgui/backends extern/igfd ${SDL2_INCLUDE_DIRS})
endif()
find_library(HAVE_JACK jack)
else()
if (WIN32)

View File

@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
<string>0.4.1</string>
<string>0.4.2</string>
<key>CFBundleName</key>
<string>Furnace</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.4.1</string>
<string>0.4.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>0.4.1</string>
<string>0.4.2</string>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>NSHighResolutionCapable</key>

View File

@ -10,8 +10,8 @@
#include <map>
#include <queue>
#define DIV_VERSION "0.4.1"
#define DIV_ENGINE_VERSION 21
#define DIV_VERSION "0.4.2"
#define DIV_ENGINE_VERSION 22
enum DivStatusView {
DIV_STATUS_NOTHING=0,