1
0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-22 05:09:13 +00:00

CMakeify plPythonPack

(cherry picked from commit 3a24302f74)
This commit is contained in:
Branan Purvine-Riley
2011-04-09 18:39:39 -07:00
committed by rarified
parent 95eaaf82a0
commit e9d004b2af
4 changed files with 29 additions and 5 deletions

View File

@ -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)

View File

@ -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})

View File

@ -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 )
{

View File

@ -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"