add version follows versioning similar to SDL
Some checks failed
ContinuousDelivery / linux-ubuntu (push) Has been cancelled
ContinuousDelivery / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android-23]) (push) Has been cancelled
ContinuousDelivery / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android-23]) (push) Has been cancelled
ContinuousDelivery / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android-23]) (push) Has been cancelled
ContinuousDelivery / windows (push) Has been cancelled
ContinuousDelivery / windows-asan (push) Has been cancelled
ContinuousDelivery / dumpsyms (push) Has been cancelled
ContinuousDelivery / release (push) Has been cancelled
ContinuousIntegration / linux (push) Has been cancelled
ContinuousIntegration / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android-23]) (push) Has been cancelled
ContinuousIntegration / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android-23]) (push) Has been cancelled
ContinuousIntegration / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android-23]) (push) Has been cancelled
ContinuousIntegration / macos (push) Has been cancelled
ContinuousIntegration / windows (push) Has been cancelled
Some checks failed
ContinuousDelivery / linux-ubuntu (push) Has been cancelled
ContinuousDelivery / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android-23]) (push) Has been cancelled
ContinuousDelivery / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android-23]) (push) Has been cancelled
ContinuousDelivery / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android-23]) (push) Has been cancelled
ContinuousDelivery / windows (push) Has been cancelled
ContinuousDelivery / windows-asan (push) Has been cancelled
ContinuousDelivery / dumpsyms (push) Has been cancelled
ContinuousDelivery / release (push) Has been cancelled
ContinuousIntegration / linux (push) Has been cancelled
ContinuousIntegration / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android-23]) (push) Has been cancelled
ContinuousIntegration / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android-23]) (push) Has been cancelled
ContinuousIntegration / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android-23]) (push) Has been cancelled
ContinuousIntegration / macos (push) Has been cancelled
ContinuousIntegration / windows (push) Has been cancelled
odd patch is dev version
This commit is contained in:
parent
c1bfed50b6
commit
241c6c2f8e
@ -1,7 +1,10 @@
|
||||
cmake_minimum_required(VERSION 3.14...3.24 FATAL_ERROR)
|
||||
|
||||
# cmake setup begin
|
||||
project(tomato)
|
||||
project(tomato
|
||||
VERSION 0.3.1
|
||||
HOMEPAGE_URL https://github.com/Green-Sky/tomato
|
||||
)
|
||||
|
||||
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
||||
|
||||
|
@ -17,7 +17,8 @@ if(SdlAndroid_FOUND)
|
||||
|
||||
|
||||
set(ANDROID_MANIFEST_PACKAGE "org.libsdl.app.tomato")
|
||||
#set(generated_manifest_path "${CMAKE_CURRENT_BINARY_DIR}/android/${TEST}-src/AndroidManifest.xml")
|
||||
set(generated_manifest_path "${CMAKE_CURRENT_BINARY_DIR}/android/app/AndroidManifest.xml")
|
||||
configure_file("app/AndroidManifest.xml.in" generated_manifest_path @ONLY)
|
||||
string(REPLACE "." "/" JAVA_PACKAGE_DIR "${ANDROID_MANIFEST_PACKAGE}")
|
||||
#set(GENERATED_SRC_FOLDER "${CMAKE_CURRENT_BINARY_DIR}/android/${TEST}-src")
|
||||
#set(GENERATED_RES_FOLDER "${GENERATED_SRC_FOLDER}/res")
|
||||
@ -25,7 +26,7 @@ if(SdlAndroid_FOUND)
|
||||
set(JAVA_PACKAGE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/app/java/${JAVA_PACKAGE_DIR}")
|
||||
|
||||
sdl_android_link_resources(tomato-apk-linked
|
||||
MANIFEST "app/AndroidManifest.xml"
|
||||
MANIFEST ${generated_manifest_path}
|
||||
PACKAGE ${ANDROID_MANIFEST_PACKAGE}
|
||||
RES_TARGETS tomato-resources
|
||||
TARGET_SDK_VERSION 31
|
||||
|
@ -5,7 +5,7 @@
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.libsdl.app.tomato"
|
||||
android:versionCode="1"
|
||||
android:versionName="1.0"
|
||||
android:versionName="@tomato_VERSION_MAJOR@.@tomato_VERSION_MINOR@.@tomato_VERSION_PATCH@"
|
||||
android:installLocation="auto">
|
||||
|
||||
<!-- OpenGL ES 2.0 -->
|
@ -169,6 +169,9 @@ if (TOMATO_TOX_AV)
|
||||
target_compile_definitions(tomato PUBLIC TOMATO_TOX_AV)
|
||||
endif()
|
||||
|
||||
configure_file(./version.hpp.in version.hpp @ONLY)
|
||||
target_include_directories(tomato PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
|
||||
|
||||
target_compile_features(tomato PUBLIC cxx_std_17)
|
||||
target_link_libraries(tomato PUBLIC
|
||||
solanaceae_util
|
||||
|
@ -6,6 +6,8 @@
|
||||
#include <imgui/backends/imgui_impl_sdlrenderer3.h>
|
||||
#include <implot.h>
|
||||
|
||||
#include "version.hpp"
|
||||
|
||||
#include "./theme.hpp"
|
||||
#include "./chat_gui/theme.hpp"
|
||||
|
||||
@ -27,6 +29,8 @@
|
||||
int main(int argc, char** argv) {
|
||||
runSysCheck();
|
||||
|
||||
std::cout << "tomato " TOMATO_VERSION_STR "\n";
|
||||
|
||||
#ifdef TOMATO_BREAKPAD
|
||||
// TODO: maybe run before sys check?
|
||||
BREAKPAD_MAIN_INIT;
|
||||
@ -40,7 +44,7 @@ int main(int argc, char** argv) {
|
||||
}
|
||||
|
||||
|
||||
SDL_SetAppMetadata("tomato", "0.0.4-wip", nullptr);
|
||||
SDL_SetAppMetadata("tomato", TOMATO_VERSION_STR, nullptr);
|
||||
|
||||
#ifdef __ANDROID__
|
||||
// change current working dir to internal storage
|
||||
|
8
src/version.hpp.in
Normal file
8
src/version.hpp.in
Normal file
@ -0,0 +1,8 @@
|
||||
#pragma once
|
||||
|
||||
#define TOMATO_VERSION_MAJOR @tomato_VERSION_MAJOR@
|
||||
#define TOMATO_VERSION_MINOR @tomato_VERSION_MINOR@
|
||||
#define TOMATO_VERSION_PATCH @tomato_VERSION_PATCH@
|
||||
|
||||
#define TOMATO_VERSION_STR "@tomato_VERSION_MAJOR@.@tomato_VERSION_MINOR@.@tomato_VERSION_PATCH@"
|
||||
|
Loading…
x
Reference in New Issue
Block a user