Skip to content

Commit

Permalink
Test std::vector<std::string> in python.
Browse files Browse the repository at this point in the history
  • Loading branch information
rhcad committed Nov 9, 2011
1 parent 8dee581 commit e2ec29b
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 83 deletions.
10 changes: 5 additions & 5 deletions code/pkg_Platform/Modules/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
ROOTDIR = ../../..
include $(ROOTDIR)/config.mk

SUBDIRS = $(filter-out Public/ x3core/ ComHook/, $(sort $(dir $(wildcard */))))
SUBDIRS = $(filter-out Public/ HookManager/ ComHook/, $(sort $(dir $(wildcard */))))
CLEANSUBDIRS = $(addsuffix .clean, $(SUBDIRS))

.PHONY: ComHook
all: ComHook
.PHONY: x3core
all: x3core

ComHook:
x3core:
@echo
@echo Making all in subdirectory $@...
$(MAKE) -C ComHook
$(MAKE) -C x3core

clean: $(CLEANSUBDIRS)

Expand Down
17 changes: 17 additions & 0 deletions code/pkg_Platform/Modules/x3core/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
ROOTDIR = ../../../..
include $(ROOTDIR)/config.mk

CFLAGS_SO += -I$(INCLUDE_DIR)/pkg_Core/Interface
CFLAGS_SO += -I$(INCLUDE_DIR)/pkg_Platform/Interface

SWIG += -I$(INCLUDE_DIR)/pkg_Core/Interface
SWIG += -outdir $(SWIGOUT_DIR)

all:
$(SWIG) x3core.i
$(CC) $(CFLAGS_SO) -c Module.cpp
$(CC) $(C_FLAGS_SO) -o $(SWIGOUT_DIR)/_x3core$(SWIGOUT_EXT) *.o
clean:
rm -rf *.so
rm -rf *.o
rm -rf x3core_wrap.cxx
5 changes: 3 additions & 2 deletions code/pkg_Platform/Modules/x3core/testcore.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import x3core as C

assert(C.LoadPluginFiles("ChangeManager"))
C.LoadPluginFiles("ChangeManager")
assert(C.LoadAllPlugins() > 0)
for f in C.GetPluginFiles(): print(f)

C.UnloadPlugins()
C.UnloadPlugins()
76 changes: 0 additions & 76 deletions code/pkg_Platform/Modules/x3core/x3core.py

This file was deleted.

3 changes: 3 additions & 0 deletions config.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ INCLUDE_DIR =$(ROOTDIR)/code
INSTALL_DIR =$(ROOTDIR)/code/bin
PLUGINS_DIR =$(INSTALL_DIR)/plugins
UNITTESTS_DIR =$(INSTALL_DIR)/tests
SWIGOUT_DIR =$(INSTALL_DIR)/python
SWIGOUT_EXT =.pyc

CC = g++
CFLAGS += -g
C_FLAGS += -Wall -g
CFLAGS_SO = $(CFLAGS) -fPIC
C_FLAGS_SO = $(C_FLAGS) -shared -fPIC
SWIG = swig.exe -c++ -python

0 comments on commit e2ec29b

Please sign in to comment.