client almost builds

src/ScriptLib/CMakeLists.txt

@@ -2,7 +2,9 @@
 
 add_library(ScriptLib STATIC ${FILE_SOURCES})
 
-# target_link_libraries(ScriptLib 
-# )
+target_link_libraries(ScriptLib 
+	lzo2
+	cryptopp-static
+)
 
 GroupSourcesByFolder(ScriptLib)

src/ScriptLib/PythonLauncher.cpp

@@ -1,6 +1,6 @@
 #include "StdAfx.h"
-#include <Python-2.7/frameobject.h>
-#include "../eterPack/EterPackManager.h"
+#include <python/frameobject.h>
+#include "eterPack/EterPackManager.h"
 
 #include "PythonLauncher.h"
 
@@ -92,7 +92,7 @@ int TraceFunc(PyObject * obj, PyFrameObject * f, int what, PyObject *arg)
 			PyTuple_GetObject(arg, 1, &exc_value);
 			PyTuple_GetObject(arg, 2, &exc_traceback);
 
-			int len;
+			Py_ssize_t len;
 			const char * exc_str;
 			PyObject_AsCharBuffer(exc_type, &exc_str, &len);
 			

src/ScriptLib/PythonLauncher.h

@@ -1,7 +1,7 @@
 #pragma once
-#include <Python-2.7/frameobject.h>
+#include <python/frameobject.h>
 
-#include "../eterBase/Singleton.h"
+#include "eterBase/Singleton.h"
 
 class CPythonLauncher : public CSingleton<CPythonLauncher>
 {

src/ScriptLib/PythonMarshal.cpp

@@ -4,7 +4,7 @@
    it would have to take circular links and sharing into account. */
 
 #include "Stdafx.h"
-#include <Python-2.7/longintrepr.h>
+#include <python/longintrepr.h>
 
 /* High water mark to determine when the marshalled object is dangerously deep
  * and risks coring the interpreter.  When the object stack gets this deep,

src/ScriptLib/StdAfx.h

@@ -6,20 +6,19 @@
 //#include <crtdbg.h>
 #ifdef _DEBUG
 	#undef _DEBUG
-	#include <Python-2.7/python.h>
+	#include <python/python.h>
 	#define _DEBUG
 #else
-	#include <Python-2.7/python.h>
+	#include <python/python.h>
 #endif
-#include <Python-2.7/node.h>
-#include <Python-2.7/grammar.h>
-#include <Python-2.7/token.h>
-#include <Python-2.7/parsetok.h>
-#include <Python-2.7/errcode.h>
-#include <Python-2.7/compile.h>
-#include <Python-2.7/symtable.h>
-#include <Python-2.7/eval.h>
-#include <Python-2.7/marshal.h>
+#include <python/node.h>
+#include <python/grammar.h>
+#include <python/token.h>
+#include <python/parsetok.h>
+#include <python/errcode.h>
+#include <python/compile.h>
+#include <python/eval.h>
+#include <python/marshal.h>
 
 #include "PythonUtils.h"
 #include "PythonLauncher.h"