Fix the build on my system

This commit is contained in:
TimePath
2017-07-16 20:46:49 +10:00
parent d7bcc7c6da
commit f2f726281e
6 changed files with 10 additions and 10 deletions
+1
View File
@@ -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(GTK_NS "GTK2" CACHE STRING "GTK variable prefix")
#-----------------------------------------------------------------------
# Defs
+2 -2
View File
@@ -27,8 +27,8 @@ add_library(gtkutil
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})
+1 -1
View File
@@ -51,7 +51,7 @@ void WinPrint( const char *str, ... ){
vsprintf( text, str, argptr );
va_end( argptr );
printf( text );
printf( "%s", text );
}
#else
void WinPrint( const char *str, ... ){
+2 -2
View File
@@ -3,8 +3,8 @@ add_library(uilib
)
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)
+1
View File
@@ -99,6 +99,7 @@ target_link_libraries(radiant
${CMAKE_DL_LIBS}
${LIBXML2_LIBRARIES}
${OPENGL_gl_LIBRARY}
${${GTK_NS}_LIBRARIES}
${GTKGL_LIBRARIES}
includes
cmdlib
+3 -5
View File
@@ -208,11 +208,9 @@ void error_redirect( const gchar *domain, GLogLevelFlags log_level, const gchar
// 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 )