diff --git a/CMakeLists.txt b/CMakeLists.txt index 8bf82b4..77b6356 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.10) -# OpenSuperClone version 2.3.3 -project(OpenSuperClone VERSION 2.3.3) +# OpenSuperClone version 2.4 +project(OpenSuperClone VERSION 2.4 HOMEPAGE_URL https://github.com/ISpillMyDrink/OpenSuperClone) # Set the GTK version to 2.x set(GTKVER 2 CACHE STRING "GTK Version") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ff1ca04..22a3fed 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,9 +1,9 @@ +find_package(PkgConfig REQUIRED) + # Find GTK dependency if(GTKVER EQUAL 2) - find_package(PkgConfig REQUIRED) pkg_check_modules(GTK2 REQUIRED gtk+-2.0) elseif(GTKVER EQUAL 3) - find_package(PkgConfig REQUIRED) pkg_check_modules(GTK3 REQUIRED gtk+-3.0) endif() diff --git a/src/opensuperclone/CMakeLists.txt b/src/opensuperclone/CMakeLists.txt index e23bc81..f60e792 100644 --- a/src/opensuperclone/CMakeLists.txt +++ b/src/opensuperclone/CMakeLists.txt @@ -53,6 +53,9 @@ add_custom_command( ) LIST(APPEND RESOURCES opensuperclone_driver.h) +# Generate config file for OpenSuperClone +configure_file(config.h.in config.h) + # Add build target OpenSuperClone add_executable(opensuperclone ${SOURCES} ${RESOURCES}) diff --git a/src/opensuperclone/clone_gui2.c b/src/opensuperclone/clone_gui2.c index 11fe023..b0eca56 100644 --- a/src/opensuperclone/clone_gui2.c +++ b/src/opensuperclone/clone_gui2.c @@ -3,6 +3,7 @@ // the GNU General Public License version 2 or later version. // This software is distributed WITHOUT ANY WARRANTY. +#include "config.h" #include "clone_gui_common.h" #include "clone_gui2.h" #include "common.h" @@ -5449,7 +5450,7 @@ void about_ccc(void) gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(dialog), temp); - gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(dialog), "www.github.com/ISpillMyDrink/OpenSuperClone"); + gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(dialog), OSC_HOMEPAGE); gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(dialog), (char *)opensuperclone_EULA_txt); diff --git a/src/opensuperclone/clone_gui3.c b/src/opensuperclone/clone_gui3.c index c5053a6..fd989d8 100644 --- a/src/opensuperclone/clone_gui3.c +++ b/src/opensuperclone/clone_gui3.c @@ -3,6 +3,7 @@ // the GNU General Public License version 2 or later version. // This software is distributed WITHOUT ANY WARRANTY. +#include "config.h" #include "clone_gui_common.h" #include "clone_gui3.h" #include "common.h" @@ -5411,7 +5412,7 @@ void about_ccc(void) gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(dialog), temp); - gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(dialog), "www.github.com/ISpillMyDrink/OpenSuperClone"); + gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(dialog), OSC_HOMEPAGE); gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(dialog), (char *)opensuperclone_EULA_txt); diff --git a/src/opensuperclone/config.h.in b/src/opensuperclone/config.h.in new file mode 100644 index 0000000..99e083c --- /dev/null +++ b/src/opensuperclone/config.h.in @@ -0,0 +1,2 @@ +#define OSC_VERSION "@OpenSuperClone_VERSION@" +#define OSC_HOMEPAGE "@OpenSuperClone_HOMEPAGE_URL@" \ No newline at end of file diff --git a/src/opensuperclone/opensuperclone.c b/src/opensuperclone/opensuperclone.c index 02488b4..564f8be 100644 --- a/src/opensuperclone/opensuperclone.c +++ b/src/opensuperclone/opensuperclone.c @@ -3,6 +3,7 @@ // the GNU General Public License version 2 or later version. // This software is distributed WITHOUT ANY WARRANTY. +#include "config.h" #include "common.h" #include "clone_gui_common.h" #include "opensuperclone.h" @@ -34,7 +35,7 @@ char *scripts_version_number = "1.9_20190413"; int main(int argc, char **argv) { title_ccc = "OpenSuperClone"; - version_number_ccc = "2.3.3"; + version_number_ccc = OSC_VERSION; copyright_year_ccc = "2022"; // Register ctrl-c signal and signal handler