diff --git a/Sources/Plasma/Apps/CMakeLists.txt b/Sources/Plasma/Apps/CMakeLists.txt index 23df716f..832661cd 100644 --- a/Sources/Plasma/Apps/CMakeLists.txt +++ b/Sources/Plasma/Apps/CMakeLists.txt @@ -1,4 +1,5 @@ -add_definitions(-D_LIB) # We shouldn't actually need this here, but - # Cyan uses it, so meh - -add_subdirectory(plClient) +add_definitions(-D_LIB) # We shouldn't actually need this here, but + # Cyan uses it, so meh + +add_subdirectory(plClient) +add_subdirectory(plPythonPack) diff --git a/Sources/Plasma/Apps/plPythonPack/CMakeLists.txt b/Sources/Plasma/Apps/plPythonPack/CMakeLists.txt new file mode 100644 index 00000000..aff647ac --- /dev/null +++ b/Sources/Plasma/Apps/plPythonPack/CMakeLists.txt @@ -0,0 +1,19 @@ +include_directories(../../CoreLib) +include_directories(../../PubUtilLib) + +include_directories(${PYTHON_INCLUDE_DIR}) + +set(plPythonPack_SOURCES + main.cpp + PythonInterface.cpp +) + +set(plPythonPack_HEADERS + PythonInterface.h +) + +add_executable(plPythonPack ${plPythonPack_SOURCES} ${plPythonPack_HEADERS}) +target_link_libraries(plPythonPack ${PYTHON_LIBRARY} CoreLib CoreLibExe plFile) + +source_group("Source Files" FILES ${plPythonPack_SOURCES}) +source_group("Header Files" FILES ${plPythonPack_HEADERS}) diff --git a/Sources/Plasma/Apps/plPythonPack/PythonInterface.cpp b/Sources/Plasma/Apps/plPythonPack/PythonInterface.cpp index e05b29aa..3c1ae0bc 100644 --- a/Sources/Plasma/Apps/plPythonPack/PythonInterface.cpp +++ b/Sources/Plasma/Apps/plPythonPack/PythonInterface.cpp @@ -155,7 +155,11 @@ hsBool PythonInterface::DumpObject(PyObject* pyobj, char** pickle, Int32* size) { PyObject *s; // the python string object where the marsalled object wil go // convert object to a marshalled string python object +#if (PY_MAJOR_VERSION == 2) && (PY_MINOR_VERSION < 4) s = PyMarshal_WriteObjectToString(pyobj); +#else + s = PyMarshal_WriteObjectToString(pyobj, 0); +#endif // did it actually do it? if ( s != NULL ) { diff --git a/Sources/Plasma/Apps/plPythonPack/main.cpp b/Sources/Plasma/Apps/plPythonPack/main.cpp index 13df5c37..2034312b 100644 --- a/Sources/Plasma/Apps/plPythonPack/main.cpp +++ b/Sources/Plasma/Apps/plPythonPack/main.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsStream.h" -#include "../plFile/hsFiles.h" +#include "plFile/hsFiles.h" #include "PythonInterface.h"