[[ RefactorGraphics ]] Tweaks to get the Mac and Linux server engines to compile and run.

livecodemichael · livecodemichael · commit a66ea76872e8 · 2013-09-06T16:34:36.000+01:00
diff --git a/engine/Makefile.kernel-server b/engine/Makefile.kernel-server
@@ -11,14 +11,14 @@ SOURCES=\
 	execpt.cpp express.cpp field.cpp fieldf.cpp fieldh.cpp fields.cpp \
 	font.cpp funcs.cpp funcsm.cpp globals.cpp graphic.cpp group.cpp \
 	handler.cpp hc.cpp hndlrlst.cpp ibmp.cpp idraw.cpp ifile.cpp \
-	igif.cpp iimport.cpp ijpg.cpp image.cpp image_rep.cpp \
-	image_rep_encoded.cpp image_rep_mutable.cpp image_rep_transformed.cpp \
+	igif.cpp iimport.cpp ijpg.cpp image.cpp image_rep.cpp imagelist.cpp \
+	image_rep_encoded.cpp image_rep_mutable.cpp \
 	imagebitmap.cpp ipng.cpp \
 	iquantization.cpp iquantize_new.cpp irle.cpp iutil.cpp \
 	itransform.cpp keywords.cpp line.cpp literal.cpp magnify.cpp mcerror.cpp \
 	mcio.cpp mcstring.cpp mctheme.cpp newobj.cpp \
 	object.cpp objptr.cpp operator.cpp paragraf.cpp param.cpp \
-	property.cpp pxmaplst.cpp pickle.cpp regex.cpp \
+	property.cpp pickle.cpp regex.cpp \
 	scriptpt.cpp scrolbar.cpp scrollbardraw.cpp sellst.cpp stack.cpp stack2.cpp \
 	stack3.cpp stackcache.cpp stacklst.cpp \
 	statemnt.cpp styledtext.cpp tooltip.cpp \
@@ -29,16 +29,17 @@ SOURCES=\
 	combiners.cpp path.cpp metacontext.cpp \
 	printer.cpp unicode.cpp rtf.cpp rtfsupport.cpp text.cpp pathgray.cpp \
 	pathprocess.cpp \
-	contextscalewrapper.cpp variablearray.cpp objectstream.cpp \
+	variablearray.cpp objectstream.cpp \
 	menuparse.cpp parentscript.cpp securemode.cpp \
 	bitmapeffect.cpp bitmapeffectblur.cpp md5.cpp sha1.cpp capsule.cpp \
 	externalv0.cpp externalv1.cpp lextable.cpp uuid.cpp \
 	objectprops.cpp objectpropsets.cpp variablevalue.cpp mcutility.cpp notify.cpp customprinter.cpp \
 	sysspec.cpp mode_server.cpp sysunxdate.cpp sysunxnetwork.cpp sysunxrandom.cpp \
 	srvmain.cpp srvspec.cpp srvsession.cpp srvstack.cpp srvflst.cpp srvposix.cpp srvdebug.cpp \
-	srvscript.cpp srvcgi.cpp srvoutput.cpp srvmultipart.cpp \
+	srvscript.cpp srvcgi.cpp srvoutput.cpp srvmultipart.cpp srvtheme.cpp \
 	eventqueue.cpp encodederrors.cpp name.cpp redraw.cpp sysregion.cpp tilecache.cpp tilecachesw.cpp \
-	fonttable.cpp fieldrtf.cpp fieldhtml.cpp fieldstyledtext.cpp paragrafattr.cpp
+	fonttable.cpp fieldrtf.cpp fieldhtml.cpp fieldstyledtext.cpp paragrafattr.cpp \
+	graphicscontext.cpp
 	
 SOURCE_DIRS=
 
diff --git a/engine/Makefile.server b/engine/Makefile.server
@@ -4,7 +4,8 @@ TYPE=application
 include ../rules/environment.linux.makefile
 
 SOURCES=\
-	stacksecurity.cpp
+	stacksecurity.cpp \
+	linuxstubs.cpp
 	
 SOURCE_DIRS=
 
@@ -18,16 +19,20 @@ CUSTOM_INCLUDES=\
 
 CUSTOM_DEPS=libkernel-server.a
 
-CUSTOM_LIBS=pcre png jpeg z core gif kernel-server
+CUSTOM_LIBS=pcre png jpeg z core gif graphics skia kernel-server
 CUSTOM_STATIC_LIBS=curl ssl crypto rt
-CUSTOM_DYNAMIC_LIBS=dl m
+CUSTOM_DYNAMIC_LIBS=dl m pthread
 
 CUSTOM_CCFLAGS=\
 	-Wall -Wno-unused-variable -Wno-switch -Wno-non-virtual-dtor -fno-exceptions -fno-rtti -fno-strict-aliasing \
 	-fmessage-length=0 
 
 CUSTOM_LDFLAGS=-export-dynamic -Wl,-x
 
+linuxstubs.cpp: src/linux.stubs
+	../prebuilt/bin/Revolution.lnx "../tools/weak_stub_maker.lc" <./src/linux.stubs >./src/linuxstubs.cpp
+
+
 include ../rules/application.linux.makefile
 
 
diff --git a/engine/src/srvstack.cpp b/engine/src/srvstack.cpp
@@ -41,6 +41,12 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
 #include "globals.h"
 
+// MM-2013-03-06: [[ RefactorGraphics ]] Added to allow server engines to compile.
+MCGFloat MCResGetDeviceScale(void)
+{
+	return 1.0;
+}
+
 MCStack *MCStack::findstackd(Window w)
 {
 	if (w == window)
@@ -153,7 +159,8 @@ void MCStack::effectrect(const MCRectangle& p_rect, Boolean& r_abort)
 	}
 }
 
-MCRectangle MCStack::getwindowrect() const
+// MM-2013-03-06: [[ RefactorGraphics ]] Added to allow server engines to compile.
+MCRectangle MCStack::device_getwindowrect() const
 {
 	return rect;	
 }
diff --git a/libgraphics/src/lnxtext.cpp b/libgraphics/src/lnxtext.cpp
@@ -6,6 +6,9 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
+extern "C" int initialise_weak_link_pango();
+extern "C" int initialise_weak_link_pangoft2();
+
 static PangoFontMap *s_font_map = NULL;
 static PangoContext *s_pango = NULL;
 static PangoLayout *s_layout = NULL;
@@ -15,6 +18,9 @@ static bool lnx_pango_initialize(void)
 	bool t_success;
 	t_success = true;
 
+	if (t_success)
+		t_success == initialise_weak_link_pango() != 0 && initialise_weak_link_pangoft2() != 0;
+	
 	if (t_success)
 		if (s_font_map == NULL)
 		{

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,12 @@ along with LiveCode. If not see <http://www.gnu.org/licenses/>. */`
`41`	`41`
`42`	`42`	`#include "globals.h"`
`43`	`43`
	`44`	`+// MM-2013-03-06: [[ RefactorGraphics ]] Added to allow server engines to compile.`
	`45`	`+MCGFloat MCResGetDeviceScale(void)`
	`46`	`+{`
	`47`	`+ return 1.0;`
	`48`	`+}`
	`49`	`+`
`44`	`50`	`MCStack *MCStack::findstackd(Window w)`
`45`	`51`	`{`
`46`	`52`	`if (w == window)`
`@@ -153,7 +159,8 @@ void MCStack::effectrect(const MCRectangle& p_rect, Boolean& r_abort)`
`153`	`159`	`}`
`154`	`160`	`}`
`155`	`161`
`156`		`-MCRectangle MCStack::getwindowrect() const`
	`162`	`+// MM-2013-03-06: [[ RefactorGraphics ]] Added to allow server engines to compile.`
	`163`	`+MCRectangle MCStack::device_getwindowrect() const`
`157`	`164`	`{`
`158`	`165`	`return rect;`
`159`	`166`	`}`