Fixes to the subprocess makefile.

Czarek · Czarek · commit 4a86a45d8f4f · 2013-06-22T14:30:57.000+02:00
diff --git a/cefpython/cef3/linux/binaries_64bit/wxpython.py b/cefpython/cef3/linux/binaries_64bit/wxpython.py
@@ -175,6 +175,7 @@ def OnExit(self):
         "browser_subprocess_path": "%s/%s" % (
             cefpython.GetModuleDirectory(), "subprocess")
     }
+    # print("browser_subprocess_path="+settings["browser_subprocess_path"])
     cefpython.Initialize(settings)
     print('wx.version=%s' % wx.version())
     app = MyApp(False)
diff --git a/cefpython/cef3/subprocess/Makefile b/cefpython/cef3/subprocess/Makefile
@@ -1,22 +1,12 @@
-CC = g++
-CCFLAGS = -g
-
-SRC = main.cpp
-OBJ = $(SRC:.cpp=.o)
-OUT = subprocess
+# -g - extra debug information
+# -O1 - more precise backtraces
+# -fPIC - required when using -shared option
 
 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
 
-LIB = -L./../linux/setup/lib_64bit/ -L./../linux/setup/lib_32bit/
-
-.cpp.o:
-	$(CC) -fPIC $(INC) $(CCFLAGS) -c $< -o $@
+LIB = -L./../linux/setup/lib_64bit -L./../linux/setup/lib_32bit
 
-$(OUT): $(OBJ)
+subprocess:
 	# Cython compiler options:
 	# -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-Bsymbolic-functions -Wl,-z,relro
-	$(CC) -fPIC -shared $(OBJ) $(LIB) -lcef_dll_wrapper -o $(OUT)
-
-clean:
-	rm *.o
-	rm *.a
+	g++ -fPIC $(INC) $(LIB) main.cpp -lcef_dll_wrapper -lcef -o subprocess -Wl,-rpath -Wl,./
diff --git a/cefpython/cef3/subprocess/client_app.h b/cefpython/cef3/subprocess/client_app.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include "util.h"
 #include "include/cef_app.h"
 
 class ClientApp : public CefApp {

Original file line number	Diff line number	Diff line change
`@@ -175,6 +175,7 @@ def OnExit(self):`
`175`	`175`	`"browser_subprocess_path": "%s/%s" % (`
`176`	`176`	`cefpython.GetModuleDirectory(), "subprocess")`
`177`	`177`	`}`
	`178`	`+ # print("browser_subprocess_path="+settings["browser_subprocess_path"])`
`178`	`179`	`cefpython.Initialize(settings)`
`179`	`180`	`print('wx.version=%s' % wx.version())`
`180`	`181`	`app = MyApp(False)`