diff --git a/Changelog.txt b/Changelog.txt index 56a649a..c18c521 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,3 +1,9 @@ +0.1.11 + +2023-01-11 Brecht Sanders https://github.com/brechtsanders/ + + * fixed Makefile to support overriding compliler with CC=<compiler> + 0.1.10 2020-10-07 Brecht Sanders https://github.com/brechtsanders/ diff --git a/Makefile b/Makefile index f27e427..add4bb2 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,3 @@ -ifeq ($(OS),) - OS = $(shell uname -s) - ifneq ($(findstring Windows,$(OS))$(findstring MINGW32,$(OS))$(findstring MSYS,$(OS)),) - OS = Windows_NT - endif -endif -PLATFORMNAME = $(OS) -ifeq ($(PLATFORMNAME),Windows_NT) - ifneq ($(findstring x86_64,$(shell gcc --version)),) - PLATFORMNAME = win64 - else ifneq ($(findstring i686,$(shell gcc --version)),) - PLATFORMNAME = win32 - endif -endif PREFIX = /usr/local CC = gcc CPP = g++ @@ -31,6 +17,20 @@ endif INCS = -Iinclude -Isrc CFLAGS = $(INCS) -Os CPPFLAGS = $(INCS) -Os +ifeq ($(OS),) + OS = $(shell uname -s) + ifneq ($(findstring Windows,$(OS))$(findstring MINGW32,$(OS))$(findstring MSYS,$(OS)),) + OS = Windows_NT + endif +endif +PLATFORMNAME = $(OS) +ifeq ($(PLATFORMNAME),Windows_NT) + ifneq ($(findstring x86_64,$(shell $(CC) --version)),) + PLATFORMNAME = win64 + else ifneq ($(findstring i686,$(shell $(CC) --version)),) + PLATFORMNAME = win32 + endif +endif ifeq ($(OS),Windows_NT) # detect if asprintf exists (needed for recent MinGW-w64 versions) CHECK_ASPRINTF=$(shell echo -e "#define _GNU_SOURCE\n#include <stdio.h>\nint main() {\n char* p;\n asprintf(&p, \".\");\n return 0;\n}\n"|gcc -xc - -ocheck_asprintf.exe -Wall && rm -f check_asprintf.exe && echo OK) diff --git a/src/proxysocket.h b/src/proxysocket.h index e7724fb..1392f1e 100644 --- a/src/proxysocket.h +++ b/src/proxysocket.h @@ -50,7 +50,7 @@ extern "C" { /*! \brief minor version number */ #define PROXYSOCKET_VERSION_MINOR 1 /*! \brief micro version number */ -#define PROXYSOCKET_VERSION_MICRO 10 +#define PROXYSOCKET_VERSION_MICRO 11 /*! @} */ /*! \brief proxy types