Bladeren bron

Changed GTK3 to GTK2 due to warnings in Ubuntu

Ithai Levi 12 jaren geleden
bovenliggende
commit
62272f6a0b
4 gewijzigde bestanden met toevoegingen van 8 en 8 verwijderingen
  1. 3 3
      gameplay/CMakeLists.txt
  2. 2 2
      samples/CMakeLists.txt
  3. 2 2
      samples/browser/CMakeLists.txt
  4. 1 1
      template/template-CMakeLists.txt

+ 3 - 3
gameplay/CMakeLists.txt

@@ -625,9 +625,9 @@ include_directories(
 
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 find_package(PkgConfig REQUIRED)
-pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
-include_directories(${GTK3_INCLUDE_DIRS})
-add_definitions(${GTK3_CFLAGS_OTHER})
+pkg_check_modules(GTK2 REQUIRED gtk+-2.0)
+include_directories(${GTK2_INCLUDE_DIRS})
+add_definitions(${GTK2_CFLAGS_OTHER})
 add_definitions(-D__linux__)
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 

+ 2 - 2
samples/CMakeLists.txt

@@ -42,12 +42,12 @@ set(GAMEPLAY_LIBRARIES
     dl
     X11
     pthread
-    gtk-3
+    gtk-x11-2.0
     glib-2.0
     gobject-2.0
 ) 
 
-add_definitions(-lstdc++ -lgameplay -lm -llua -lz -lpng -lvorbis -logg -lBulletCollision -lBulletDynamics -lLinearMath -lopenal -LGLEW -lGL -lrt -ldl -lX11 -lpthread -lgtk-3 -lglib-2.0 -lgobject-2.0)
+add_definitions(-lstdc++ -lgameplay -lm -llua -lz -lpng -lvorbis -logg -lBulletCollision -lBulletDynamics -lLinearMath -lopenal -LGLEW -lGL -lrt -ldl -lX11 -lpthread -lgtk-x11-2.0 -lglib-2.0 -lgobject-2.0)
 
 add_subdirectory(browser)
 add_subdirectory(character)

+ 2 - 2
samples/browser/CMakeLists.txt

@@ -41,12 +41,12 @@ set(GAMEPLAY_LIBRARIES
     dl
     X11
     pthread
-    gtk-3
+    gtk-x11-2.0
     glib-2.0
     gobject-2.0
 ) 
 
-add_definitions(-lstdc++ -lgameplay -lm -llua -lz -lpng -lvorbis -logg -lBulletCollision -lBulletDynamics -lLinearMath -lopenal -LGLEW -lGL -lrt -ldl -lX11 -lpthread -lgtk-3 -lglib-2.0 -lgobject-2.0)
+add_definitions(-lstdc++ -lgameplay -lm -llua -lz -lpng -lvorbis -logg -lBulletCollision -lBulletDynamics -lLinearMath -lopenal -LGLEW -lGL -lrt -ldl -lX11 -lpthread -lgtk-x11-2.0 -lglib-2.0 -lgobject-2.0)
 
 set( GAME_NAME sample-browser)
 

+ 1 - 1
template/template-CMakeLists.txt

@@ -118,7 +118,7 @@ IF (TARGET_OS STREQUAL "LINUX")
 	append_gameplay_ext_lib(GAMEPLAY_LIBRARIES "dl" "")
 	append_gameplay_ext_lib(GAMEPLAY_LIBRARIES "rt" "" )
 	append_gameplay_ext_lib(GAMEPLAY_LIBRARIES "pthread" "" )
-	append_gameplay_ext_lib(GAMEPLAY_LIBRARIES "gtk-3" "" )
+	append_gameplay_ext_lib(GAMEPLAY_LIBRARIES "gtk-x11-2.0" "" )
 	append_gameplay_ext_lib(GAMEPLAY_LIBRARIES "gobject-2.0" "" )
 	append_gameplay_ext_lib(GAMEPLAY_LIBRARIES "glib-2.0" "" )