Browse Source

CMakeify plPythonPack

(cherry picked from commit 3a24302f74)
rarified/huru-merge-work/cmake-building
Branan Purvine-Riley 14 years ago committed by rarified
parent
commit
e9d004b2af
  1. 9
      Sources/Plasma/Apps/CMakeLists.txt
  2. 19
      Sources/Plasma/Apps/plPythonPack/CMakeLists.txt
  3. 4
      Sources/Plasma/Apps/plPythonPack/PythonInterface.cpp
  4. 2
      Sources/Plasma/Apps/plPythonPack/main.cpp

9
Sources/Plasma/Apps/CMakeLists.txt

@ -1,4 +1,5 @@
add_definitions(-D_LIB) # We shouldn't actually need this here, but add_definitions(-D_LIB) # We shouldn't actually need this here, but
# Cyan uses it, so meh # Cyan uses it, so meh
add_subdirectory(plClient) add_subdirectory(plClient)
add_subdirectory(plPythonPack)

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

4
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 PyObject *s; // the python string object where the marsalled object wil go
// convert object to a marshalled string python object // convert object to a marshalled string python object
#if (PY_MAJOR_VERSION == 2) && (PY_MINOR_VERSION < 4)
s = PyMarshal_WriteObjectToString(pyobj); s = PyMarshal_WriteObjectToString(pyobj);
#else
s = PyMarshal_WriteObjectToString(pyobj, 0);
#endif
// did it actually do it? // did it actually do it?
if ( s != NULL ) if ( s != NULL )
{ {

2
Sources/Plasma/Apps/plPythonPack/main.cpp

@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "hsStream.h" #include "hsStream.h"
#include "../plFile/hsFiles.h" #include "plFile/hsFiles.h"
#include "PythonInterface.h" #include "PythonInterface.h"

Loading…
Cancel
Save