mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-24 14:49:42 -06:00
Several little things.
The C version of the GenericLog was being used in both C and C++ branches of the code. Parent panic alerts by the main_frame so that those windows get the icon too. Fix a couple of compiler warnings. Added some checks for libraries in the cmake build. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6385 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -86,10 +86,6 @@ endif(CMAKE_BUILD_TYPE STREQUAL Release)
|
||||
# be needed by users is optional defaulting to ON, other stuff (like e.g.
|
||||
# sound backends) is completely optional.
|
||||
|
||||
# TODO: wxWidgets: When building the Debug configuration, we should probably
|
||||
# check if the debug wx libs are available and fall back to the bundled ones
|
||||
# otherwise.
|
||||
|
||||
include(FindOpenGL REQUIRED)
|
||||
include_directories(${OPENGL_INCLUDE_DIR})
|
||||
|
||||
@ -287,6 +283,12 @@ endif()
|
||||
if(WIN32)
|
||||
find_library(GLEW glew32s PATHS Externals/GLew)
|
||||
include_directories(Externals/GLew/include)
|
||||
else()
|
||||
include(CheckLib)
|
||||
check_lib(GLEW glew TRUE)
|
||||
check_lib(GLU glu TRUE)
|
||||
check_lib(CG Cg TRUE)
|
||||
check_lib(CGGL CgGL TRUE)
|
||||
endif()
|
||||
|
||||
if(NOT APPLE)
|
||||
@ -305,12 +307,9 @@ if(NOT DISABLE_WX)
|
||||
include(${wxWidgets_USE_FILE})
|
||||
|
||||
if(UNIX)
|
||||
pkg_search_module(GTK2 REQUIRED gtk+-2.0)
|
||||
check_lib(GTK2 gtk+-2.0 TRUE)
|
||||
if(GTK2_FOUND)
|
||||
include_directories(${GTK2_INCLUDE_DIRS})
|
||||
message("GTK 2 found")
|
||||
else(GTK2_FOUND)
|
||||
message("GTK 2 NOT found")
|
||||
endif(GTK2_FOUND)
|
||||
endif(UNIX)
|
||||
|
||||
|
Reference in New Issue
Block a user