Commit 907b6f38 authored Nov 03, 2020 by Robert Izzard

use new API function to output JSON

clean up loading of .h files

fix setup.py to not define macros that break .h file loading

parent d95a587d

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@ output/*
		.nfs
		*.swp
		.python-version
		\#*

		__pycache__/
		.ipynb_checkpoints/

include/binary_c_python.h

+4 −5

Original line number	Diff line number	Diff line
		@@ -5,10 +5,9 @@
		/*
		* Include binary_C's API
		*/

		#include "binary_c_API.h"
		#include "binary_c.h"
		#include "binary_c_API_prototypes.h"
		//#include "binary_c_API.h"
		//#include "binary_c_API_prototypes.h"

		/* Binary_c's python API prototypes */
		int run_system(char * argstring,

setup.py

+4 −5

Original line number	Diff line number	Diff line
		@@ -115,7 +115,6 @@ for x in DEFINES:

		# add API header file
		API_h = os.path.join(BINARY_C_DIR, "src", "API", "binary_c_API.h")
		BINARY_C_DEFINE_MACROS.extend([("BINARY_C_API_H", API_h)])

		############################################################
		# Setting all directories and LIBRARIES to their final values