Moved py3c dependencies to src/c/external folder

dbdb429a · Mark Winter · 0f53cd96 · dbdb429a · dbdb429a · dbdb429a
Commit dbdb429a authored 6 years ago by Mark Winter
--- a/src/c/CudaPy3DLL.vcxproj
+++ b/src/c/CudaPy3DLL.vcxproj
@@ -136,7 +136,7 @@
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CUDAPY3DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>Python;$(PYTHON3_DIR)/include;$(NUMPY3_DIR)/core/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>external;Python;$(PYTHON3_DIR)/include;$(NUMPY3_DIR)/core/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessToFile>false</PreprocessToFile>
    </ClCompile>
    <Link>
@@ -153,7 +153,7 @@
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;CUDAPY3DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>Python;$(PYTHON3_DIR)/include;$(NUMPY3_DIR)/core/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>external;Python;$(PYTHON3_DIR)/include;$(NUMPY3_DIR)/core/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessToFile>false</PreprocessToFile>
    </ClCompile>
    <Link>
@@ -172,7 +172,7 @@
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CUDAPY3DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>Python;$(PYTHON3_DIR)/include;$(NUMPY3_DIR)/core/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>external;Python;$(PYTHON3_DIR)/include;$(NUMPY3_DIR)/core/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessToFile>false</PreprocessToFile>
    </ClCompile>
    <Link>
@@ -193,7 +193,7 @@
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;CUDAPY3DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>Python;$(PYTHON3_DIR)/include;$(NUMPY3_DIR)/core/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>external;Python;$(PYTHON3_DIR)/include;$(NUMPY3_DIR)/core/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessToFile>false</PreprocessToFile>
    </ClCompile>
    <Link>

--- a/src/c/external/README
+++ b/src/c/external/README
+This folder contains external source-only dependencies which are distributed along with this project for build simplicity
+
+External dependencies:
+ - py3c - https://py3c.readthedocs.io
+ 
\ No newline at end of file
--- a/src/c/Python/py3c.h
+++ b/src/c/Python/py3c.h
--- a/src/c/Python/py3c/capsulethunk.h
+++ b/src/c/Python/py3c/capsulethunk.h
--- a/src/c/Python/py3c/comparison.h
+++ b/src/c/Python/py3c/comparison.h
--- a/src/c/Python/py3c/compat.h
+++ b/src/c/Python/py3c/compat.h
--- a/src/c/Python/py3c/fileshim.h
+++ b/src/c/Python/py3c/fileshim.h
--- a/src/c/Python/py3c/py3shims.h
+++ b/src/c/Python/py3c/py3shims.h
--- a/src/c/Python/py3c/tpflags.h
+++ b/src/c/Python/py3c/tpflags.h
--- a/src/c/makefile
+++ b/src/c/makefile
@@ -23,8 +23,8 @@ MEX_CPP_OBJ = $(notdir $(MEX_CPP_FILES:.cpp=.o))
 PY_CPP_OBJ = $(notdir $(PY_CPP_FILES:.cpp=.o))

 CUDA_INC = -I./Cuda
-MEX_INC = -I./WrapCmds -I./Mex -I$(MATALAB_DIR)/extern/include
-PY_INC = -I./WrapCmds -I./Python -I./Python/py3c -I$(PYTHON3_INC) -I$(NUMPY3_INC)
+MEX_INC = -I./WrapCmds -I./Mex -I./external -I$(MATALAB_DIR)/extern/include
+PY_INC = -I./WrapCmds -I./Python -I./Python -I./external -I$(PYTHON3_INC) -I$(NUMPY3_INC)

 MEX_LIB = -L$(MATALAB_DIR)/bin/glnxa64/libmx.so -L$(MATALAB_DIR)/bin/glnxa64/libmex.so
 PY_LIB = -L$(PYTHON_LIB) -l$(PYTHON_VER)