Fix the build on my system

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dda42c76e15f5f3a1c6bd4a8b2d7bdb43495c161..78efba947a1ca4b171924105d550179342932979 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,6 +63,7 @@ endif ()
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}   -fno-strict-aliasing")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing -fno-exceptions -fno-rtti")
 set(CMAKE_POSITION_INDEPENDENT_CODE 1)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}   -fno-strict-aliasing")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing -fno-exceptions -fno-rtti")
 set(CMAKE_POSITION_INDEPENDENT_CODE 1)

+set(GTK_NS "GTK2" CACHE STRING "GTK variable prefix")

 
 #-----------------------------------------------------------------------
 # Defs
 
 #-----------------------------------------------------------------------
 # Defs

diff --git a/libs/gtkutil/CMakeLists.txt b/libs/gtkutil/CMakeLists.txt
index fea03d80cbd639975f5ed4e92dbf4e01df0dee33..bc5d772cbf9ec7629038d1cfbb9d9622558db363 100644 (file)
--- a/libs/gtkutil/CMakeLists.txt
+++ b/libs/gtkutil/CMakeLists.txt
@@ -27,8 +27,8 @@ add_library(gtkutil
 target_include_directories(gtkutil PRIVATE uilib)
 target_link_libraries(gtkutil PRIVATE uilib)
 
 target_include_directories(gtkutil PRIVATE uilib)
 target_link_libraries(gtkutil PRIVATE uilib)
 

-target_include_directories(gtkutil PRIVATE ${GTK2_PANGO_INCLUDE_DIR})
-target_link_libraries(gtkutil PRIVATE ${GTK2_PANGO_LIBRARY})
+target_include_directories(gtkutil PRIVATE ${${GTK_NS}_INCLUDE_DIRS})
+target_link_libraries(gtkutil PRIVATE ${${GTK_NS}_LIBRARIES})

 
 find_package(GtkGLExt REQUIRED)
 target_include_directories(gtkutil PRIVATE ${GTKGL_INCLUDE_DIRS})
 
 find_package(GtkGLExt REQUIRED)
 target_include_directories(gtkutil PRIVATE ${GTKGL_INCLUDE_DIRS})

diff --git a/libs/l_net/l_net.c b/libs/l_net/l_net.c
index caf6c4228d9aff64d892d2d21779ca61b1f2516c..7f50d054b94a1f0d10c8b6e14ea5881c011f6700 100644 (file)
--- a/libs/l_net/l_net.c
+++ b/libs/l_net/l_net.c
@@ -51,7 +51,7 @@ void WinPrint( const char *str, ... ){
        vsprintf( text, str, argptr );
        va_end( argptr );
 
        vsprintf( text, str, argptr );
        va_end( argptr );
 

-       printf( text );
+       printf( "%s", text );

 }
 #else
 void WinPrint( const char *str, ... ){
 }
 #else
 void WinPrint( const char *str, ... ){

diff --git a/libs/uilib/CMakeLists.txt b/libs/uilib/CMakeLists.txt
index c664d9c01be686ce33d3dce99adff5796911c37f..f10ee3adde90391fe0f77ee075598aa4c3eb6c94 100644 (file)
--- a/libs/uilib/CMakeLists.txt
+++ b/libs/uilib/CMakeLists.txt
@@ -3,8 +3,8 @@ add_library(uilib
         )
 
 find_package(GTK2 REQUIRED)
         )
 
 find_package(GTK2 REQUIRED)

-target_include_directories(uilib PUBLIC ${GTK2_INCLUDE_DIRS})
-target_link_libraries(uilib PUBLIC ${GTK2_LIBRARIES})
+target_include_directories(uilib PUBLIC ${${GTK_NS}_INCLUDE_DIRS})
+target_link_libraries(uilib PUBLIC ${${GTK_NS}_LIBRARIES})

 
 target_include_directories(uilib PUBLIC gtkutil)
 target_link_libraries(uilib PUBLIC gtkutil)
 
 target_include_directories(uilib PUBLIC gtkutil)
 target_link_libraries(uilib PUBLIC gtkutil)

diff --git a/radiant/CMakeLists.txt b/radiant/CMakeLists.txt
index a882ffe27235e918bedccca1e44847f6aac7b82d..958384cca45818b4b847e0f1d1baa9f44757922c 100644 (file)
--- a/radiant/CMakeLists.txt
+++ b/radiant/CMakeLists.txt
@@ -99,6 +99,7 @@ target_link_libraries(radiant
     ${CMAKE_DL_LIBS}
     ${LIBXML2_LIBRARIES}
     ${OPENGL_gl_LIBRARY}
     ${CMAKE_DL_LIBS}
     ${LIBXML2_LIBRARIES}
     ${OPENGL_gl_LIBRARY}

+    ${${GTK_NS}_LIBRARIES}

     ${GTKGL_LIBRARIES}
     includes
     cmdlib
     ${GTKGL_LIBRARIES}
     includes
     cmdlib

diff --git a/radiant/main.cpp b/radiant/main.cpp
index c669aba41f4d5367024720aa6ed6a2d2c9f04b11..196297ede2ad6e226e14ade58e077afc2585bc31 100644 (file)
--- a/radiant/main.cpp
+++ b/radiant/main.cpp
@@ -208,11 +208,9 @@ void error_redirect( const gchar *domain, GLogLevelFlags log_level, const gchar
        // spam it...
        globalErrorStream() << buf << "\n";
 
        // spam it...
        globalErrorStream() << buf << "\n";
 

-       // FIXME why are warnings is_fatal?
-#ifndef _DEBUG
-       if ( is_fatal )
-#endif
-       ERROR_MESSAGE( "GTK+ error: " << buf );
+       if (is_fatal) {
+           ERROR_MESSAGE( "GTK+ error: " << buf );
+    }

 }
 
 #if defined ( _DEBUG ) && defined ( WIN32 ) && defined ( _MSC_VER )
 }
 
 #if defined ( _DEBUG ) && defined ( WIN32 ) && defined ( _MSC_VER )