mirror of
https://github.com/ISpillMyDrink/OpenSuperClone.git
synced 2026-09-25 19:45:45 +00:00
Fix some minor compiler warnings.
Minor changes to build system.
This commit is contained in:
+2
-1
@@ -8,4 +8,5 @@ cmake_install.cmake
|
||||
install_manifest.txt
|
||||
compile_commands.json
|
||||
CTestTestfile.cmake
|
||||
_deps
|
||||
_deps
|
||||
build
|
||||
+2
-5
@@ -4,16 +4,13 @@ cmake_minimum_required(VERSION 3.10)
|
||||
project(OpenSuperClone VERSION 2.3.3)
|
||||
|
||||
# Set the GTK version to 2.x
|
||||
set(GTKVER 2)
|
||||
|
||||
set(CMAKE_C_COMPILER gcc)
|
||||
set(GTKVER 2 CACHE STRING "GTK Version")
|
||||
|
||||
set(GCC_OPTIONS
|
||||
-Wall
|
||||
-W
|
||||
-Wextra
|
||||
-Wno-deprecated-declarations
|
||||
-fcommon
|
||||
-lcurl
|
||||
)
|
||||
|
||||
set(CMAKE_EXE_LINKER_FLAGS "-export-dynamic")
|
||||
|
||||
@@ -1164,15 +1164,15 @@ int print_gui_error_message_ccc(char *message, char *title, int type)
|
||||
GtkDialogFlags message_type;
|
||||
if (type)
|
||||
{
|
||||
message_type = GTK_MESSAGE_WARNING;
|
||||
message_type = (GtkDialogFlags)GTK_MESSAGE_WARNING;
|
||||
// dialog = gtk_message_dialog_new(GTK_WINDOW(main_window_ccc), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "%s", message);
|
||||
}
|
||||
else
|
||||
{
|
||||
message_type = GTK_MESSAGE_INFO;
|
||||
message_type = (GtkDialogFlags)GTK_MESSAGE_INFO;
|
||||
// dialog = gtk_message_dialog_new(GTK_WINDOW(main_window_ccc), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "%s", message);
|
||||
}
|
||||
dialog = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_DESTROY_WITH_PARENT, message_type, GTK_BUTTONS_OK, "%s", message);
|
||||
dialog = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_DESTROY_WITH_PARENT, (GtkMessageType)message_type, GTK_BUTTONS_OK, "%s", message);
|
||||
gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE);
|
||||
gtk_window_set_title(GTK_WINDOW(dialog), title);
|
||||
gtk_dialog_run(GTK_DIALOG(dialog));
|
||||
|
||||
@@ -17,12 +17,4 @@ add_executable(oscviewer ${SOURCES} oscviewer${GTKVER}_glade.h)
|
||||
|
||||
target_link_libraries(oscviewer ${LIBRARIES})
|
||||
|
||||
set(GCC_OPTIONS
|
||||
-Wall
|
||||
-W
|
||||
-Wno-deprecated-declarations
|
||||
-fcommon
|
||||
-lcurl
|
||||
)
|
||||
|
||||
target_compile_options(oscviewer PRIVATE ${GCC_OPTIONS})
|
||||
@@ -2909,7 +2909,7 @@ int get_block_information(long long position, long long size)
|
||||
long long bad = 0;
|
||||
long long finished = 0;
|
||||
long long hightime = 0;
|
||||
char tempchar[256];
|
||||
char tempchar[384];
|
||||
char lines[maxcount * sizeof(tempchar)];
|
||||
strcpy(lines, "");
|
||||
// process current status
|
||||
@@ -3323,15 +3323,15 @@ int print_gui_error_message(char *message, char *title, int type)
|
||||
GtkDialogFlags message_type;
|
||||
if (type)
|
||||
{
|
||||
message_type = GTK_MESSAGE_WARNING;
|
||||
message_type = (GtkDialogFlags)GTK_MESSAGE_WARNING;
|
||||
// dialog = gtk_message_dialog_new(GTK_WINDOW(main_window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "%s", message);
|
||||
}
|
||||
else
|
||||
{
|
||||
message_type = GTK_MESSAGE_INFO;
|
||||
message_type = (GtkDialogFlags)GTK_MESSAGE_INFO;
|
||||
// dialog = gtk_message_dialog_new(GTK_WINDOW(main_window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "%s", message);
|
||||
}
|
||||
dialog = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_DESTROY_WITH_PARENT, message_type, GTK_BUTTONS_OK, "%s", message);
|
||||
dialog = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_DESTROY_WITH_PARENT, (GtkMessageType)message_type, GTK_BUTTONS_OK, "%s", message);
|
||||
gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE);
|
||||
gtk_window_set_title(GTK_WINDOW(dialog), title);
|
||||
gtk_dialog_run(GTK_DIALOG(dialog));
|
||||
|
||||
@@ -347,7 +347,7 @@ int selected_color = WHITE;
|
||||
int time_color = WHITE;
|
||||
int domain_color = YELLOW;
|
||||
int main_grid_size = MAINGRIDSIZE;
|
||||
gint timeout_tag = NULL;
|
||||
gint timeout_tag = 0;
|
||||
int autotimer_on = 0;
|
||||
int show_bad_head = 0;
|
||||
int show_good_data = 0;
|
||||
|
||||
@@ -2392,15 +2392,15 @@ int print_gui_error_message(char *message, char *title, int type)
|
||||
GtkDialogFlags message_type;
|
||||
if (type)
|
||||
{
|
||||
message_type = GTK_MESSAGE_WARNING;
|
||||
message_type = (GtkDialogFlags)GTK_MESSAGE_WARNING;
|
||||
// dialog = gtk_message_dialog_new(GTK_WINDOW(main_window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "%s", message);
|
||||
}
|
||||
else
|
||||
{
|
||||
message_type = GTK_MESSAGE_INFO;
|
||||
message_type = (GtkDialogFlags)GTK_MESSAGE_INFO;
|
||||
// dialog = gtk_message_dialog_new(GTK_WINDOW(main_window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "%s", message);
|
||||
}
|
||||
dialog = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_DESTROY_WITH_PARENT, message_type, GTK_BUTTONS_OK, "%s", message);
|
||||
dialog = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_DESTROY_WITH_PARENT, (GtkMessageType)message_type, GTK_BUTTONS_OK, "%s", message);
|
||||
gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE);
|
||||
gtk_window_set_title(GTK_WINDOW(dialog), title);
|
||||
gtk_dialog_run(GTK_DIALOG(dialog));
|
||||
|
||||
Reference in New Issue
Block a user