Directory structure under "cef1/linux/" changed to support both · pythonthings/cefpython@e5d9e59 · GitHub
Skip to content

Commit e5d9e59

Browse files
CzarekCzarek
Czarek
authored and
Czarek
committed
Directory structure under "cef1/linux/" changed to support both
32bit and 64bit architectures. Compile scripts updated to reflect that. Updated makefiles on Linux to make it work on 64bit platform. Fixes to cython and setup files for the 64bit platform on Linux. Created 64bit binaries for Ubuntu 12.04 LTS.
1 parent 25d7ddb commit e5d9e59

18 files changed

Lines changed: 1276 additions & 31 deletions

File tree

‎cefpython/browser.pyx‎

Lines changed: 7 additions & 7 deletions

‎cefpython/cef1/client_handler/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ SRC = client_handler.cpp
55
OBJ = $(SRC:.cpp=.o)
66
OUT = libclient_handler.a
77

8-
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
8+
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
99

1010
.cpp.o:
11-
$(CC) $(INC) $(CCFLAGS) -c $< -o $@
11+
$(CC) -fPIC $(INC) $(CCFLAGS) -c $< -o $@
1212

1313
$(OUT): $(OBJ)
1414
ar rcs $(OUT) $(OBJ)

cefpython/cef1/linux/binaries/LICENSE.txt renamed to cefpython/cef1/linux/binaries_32bit/LICENSE.txt

File renamed without changes.

cefpython/cef1/linux/binaries/cefpython_py27.py renamed to cefpython/cef1/linux/binaries_32bit/cefpython_py27.py

File renamed without changes.

cefpython/cef1/linux/binaries/cefsimple.html renamed to cefpython/cef1/linux/binaries_32bit/cefsimple.html

File renamed without changes.

cefpython/cef1/linux/binaries/pygtk_.py renamed to cefpython/cef1/linux/binaries_32bit/pygtk_.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
# An example of embedding CEF browser in PyGTK on Linux.
22

3-
import platform
4-
if platform.architecture()[0] != "32bit":
5-
raise Exception("Only 32bit architecture is supported")
6-
73
import ctypes, os, sys
84
libcef_so = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'libcef.so')
95
if os.path.exists(libcef_so):
@@ -24,7 +20,7 @@
2420
import re
2521

2622
def GetApplicationPath(file=None):
27-
import re, os
23+
import re, os, platform
2824
# If file is None return current directory without trailing slash.
2925
if file is None:
3026
file = ""

cefpython/cef1/linux/binaries/wxpython.py renamed to cefpython/cef1/linux/binaries_32bit/wxpython.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
# An example of embedding CEF browser in wxPython on Linux.
22

3-
import platform
4-
if platform.architecture()[0] != "32bit":
5-
raise Exception("Only 32bit architecture is supported")
6-
73
import ctypes, os, sys
84
libcef_so = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'libcef.so')
95
if os.path.exists(libcef_so):
@@ -31,7 +27,7 @@
3127
USE_EVT_IDLE = False
3228

3329
def GetApplicationPath(file=None):
34-
import re, os
30+
import re, os, platform
3531
# If file is None return current directory without trailing slash.
3632
if file is None:
3733
file = ""

‎cefpython/cef1/linux/binaries_64bit/LICENSE.txt‎

Lines changed: 36 additions & 0 deletions

0 commit comments

Comments
 (0)