Add include paths for Fedora/SUSE/Arch in makefiles/setup.py. Issue 141.

cztomczak · cztomczak · commit b0d2ffc2c2da · 2014-12-04T15:22:24.000+01:00
diff --git a/cefpython/cef3/client_handler/Makefile b/cefpython/cef3/client_handler/Makefile
@@ -22,7 +22,9 @@ INC = -I./../ -I/usr/include/python2.7 -I/usr/include/gtk-2.0 \
 	-I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/include/cairo \
 	-I/usr/include/pango-1.0 -I/usr/include/gdk-pixbuf-2.0 \
 	-I/usr/include/atk-1.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include \
-	-I/usr/lib/x86_64-linux-gnu/gtk-2.0/include
+	-I/usr/lib/x86_64-linux-gnu/gtk-2.0/include \
+	-I/usr/lib64/glib-2.0/include -I/usr/lib64/gtk-2.0/include \
+	-I/usr/lib/glib-2.0/include -I/usr/lib/gtk-2.0/include
 
 .cpp.o:
 	$(CC) $(CCFLAGS) $(INC) -c $< -o $@
diff --git a/cefpython/cef3/linux/setup/setup.py b/cefpython/cef3/linux/setup/setup.py
@@ -55,15 +55,20 @@ def CompileTimeConstants():
         r'./../../../cython_includes/',
         '/usr/include/gtk-2.0',
         '/usr/include/glib-2.0',
-        '/usr/lib/i386-linux-gnu/gtk-2.0/include',
-        '/usr/lib/i386-linux-gnu/glib-2.0/include',
         '/usr/include/cairo',
         '/usr/include/pango-1.0',
         '/usr/include/gdk-pixbuf-2.0',
         '/usr/include/atk-1.0',
-        # 64bit Ubuntu
+        # Ubuntu
         '/usr/lib/x86_64-linux-gnu/glib-2.0/include',
         '/usr/lib/x86_64-linux-gnu/gtk-2.0/include',
+        '/usr/lib/i386-linux-gnu/gtk-2.0/include',
+        '/usr/lib/i386-linux-gnu/glib-2.0/include',
+        # Fedora
+        '/usr/lib64/glib-2.0/include',
+        '/usr/lib64/gtk-2.0/include',
+        '/usr/lib/glib-2.0/include',
+        '/usr/lib/gtk-2.0/include',
     ],
 
     # http_authentication not implemented on Linux.
diff --git a/cefpython/cef3/subprocess/Makefile b/cefpython/cef3/subprocess/Makefile
@@ -9,7 +9,9 @@ INC = -I./../ -I/usr/include/python2.7 -I/usr/include/gtk-2.0 \
 	-I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/include/cairo \
 	-I/usr/include/pango-1.0 -I/usr/include/gdk-pixbuf-2.0 \
 	-I/usr/include/atk-1.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include \
-	-I/usr/lib/x86_64-linux-gnu/gtk-2.0/include
+	-I/usr/lib/x86_64-linux-gnu/gtk-2.0/include \
+	-I/usr/lib64/glib-2.0/include -I/usr/lib64/gtk-2.0/include \
+	-I/usr/lib/glib-2.0/include -I/usr/lib/gtk-2.0/include
 
 LIB = -L./../linux/setup/lib_64bit -L./../linux/setup/lib_32bit \
 	-L./../linux/binaries_64bit -L./../linux/binaries_32bit
diff --git a/cefpython/cef3/subprocess/Makefile-libcefpythonapp b/cefpython/cef3/subprocess/Makefile-libcefpythonapp
@@ -21,7 +21,9 @@ INC = -I./../ -I/usr/include/python2.7 -I/usr/include/gtk-2.0 \
     -I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/include/cairo \
     -I/usr/include/pango-1.0 -I/usr/include/gdk-pixbuf-2.0 \
     -I/usr/include/atk-1.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include \
-    -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include
+    -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include \
+    -I/usr/lib64/glib-2.0/include -I/usr/lib64/gtk-2.0/include \
+    -I/usr/lib/glib-2.0/include -I/usr/lib/gtk-2.0/include
 
 .cpp.o:
 	$(CC) $(CCFLAGS) $(INC) -c $< -o $@
diff --git a/cefpython/cpp_utils/Makefile b/cefpython/cpp_utils/Makefile
@@ -5,7 +5,14 @@ SRC = PaintBuffer.cpp
 OBJ = $(SRC:.cpp=.o)
 OUT = libcpp_utils.a
 
-INC = -I./../ -I/usr/include/python2.7 -I/usr/include/gtk-2.0 -I/usr/include/glib-2.0 -I/usr/lib/i386-linux-gnu/gtk-2.0/include -I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include
+INC = -I./../ -I/usr/include/python2.7 -I/usr/include/gtk-2.0 \
+	-I/usr/include/glib-2.0 -I/usr/lib/i386-linux-gnu/gtk-2.0/include \
+	-I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/include/cairo \
+	-I/usr/include/pango-1.0 -I/usr/include/gdk-pixbuf-2.0 \
+	-I/usr/include/atk-1.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include \
+	-I/usr/lib/x86_64-linux-gnu/gtk-2.0/include \
+	-I/usr/lib64/glib-2.0/include -I/usr/lib64/gtk-2.0/include \
+	-I/usr/lib/glib-2.0/include -I/usr/lib/gtk-2.0/include
 
 .cpp.o:
 	$(CC) -fPIC $(INC) $(CCFLAGS) -c $< -o $@
