Commit 6868dfe5 authored by David Hendriks's avatar David Hendriks
Browse files

removed the macro extend line

parent a313d9ec

Makefile

+1 −2
Original line number Diff line number Diff line
@@ -46,12 +46,10 @@ PY_EXEC := python3 
PY_SETUP 			:= setup.py

#PY_OPTIONS 			:= build_ext --build-lib $(TARGET_LIB_DIR)

PY_OPTIONS 			:= build_ext --inplace

# maybe pass argument from here to the setup.py?



all:

	$(CC) -DBINARY_C=$(BINARY_C) $(CFLAGS) $(INCDIRS) $(C_SRC) -o $(OBJECTS) $(OBJ_FLAGS) $(LIBS) 

	$(CC) -DBINARY_C=$(BINARY_C) $(SO_FLAGS) -o $(SO_NAME) $(OBJECTS)

	@echo pythoniajiajjaaiajaij

	$(PY_EXEC) $(PY_SETUP) $(PY_OPTIONS)



test:
@@ -60,6 +58,7 @@ test: 
	@echo C_SRC: $(C_SRC)

	@echo CFLAGS: $(CFLAGS)

	@echo INCDIRS: $(INCDIRS)

	@echo SO_NAME: $(SO_NAME)



clean:

	$(RM) $(OBJ_DIR)/*.o $(TARGET_LIB_DIR)/*.so

include/binary_c_python.h

+2 −0
Original line number Diff line number Diff line
@@ -5,7 +5,9 @@ 
/*

 * Include binary_C's API

 */



#include "binary_c_API.h"

// #include "binary_c.h"

// #include "binary_c_API_prototypes.h"



/* Binary_c's python API prototypes */

setup.py

+1 −6
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ BINARY_C_VERSION = ( 
    .stdout.decode("utf-8")

    .split()

)

# check_version(BINARY_C_VERSION[0], REQUIRED_BINARY_C_VERSION)

check_version(BINARY_C_VERSION[0], REQUIRED_BINARY_C_VERSION)



BINARY_C_INCDIRS = (

    subprocess.run(
@@ -110,10 +110,6 @@ for x in DEFINES: 
        if y:

            BINARY_C_DEFINE_MACROS.extend([(y.group(1), None)])



# 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

############################################################
@@ -153,7 +149,6 @@ print("LIBRARIES: ", str(LIBRARIES) + "\n") 
print("LIBRARY_DIRS: ", str(LIBRARY_DIRS) + "\n")

print("RUNTIME_LIBRARY_DIRS: ", str(RUNTIME_LIBRARY_DIRS) + "\n")

print("BINARY_C_CFLAGS: ", str(BINARY_C_CFLAGS) + "\n")

print("API_h: ", str(API_h) + "\n")

print("macros: ", str(BINARY_C_DEFINE_MACROS) + "\n")

print('\n')