From 8e763741d53f92469dad373662227ffd49a784fd Mon Sep 17 00:00:00 2001 From: rexy712 Date: Fri, 13 Sep 2019 17:37:12 -0700 Subject: [PATCH] Fixed windows clean target and shared library build --- makefile.library | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makefile.library b/makefile.library index 328ed7c..6d5e3f4 100644 --- a/makefile.library +++ b/makefile.library @@ -27,6 +27,7 @@ INCLUDE_DIRS::=include CXXFLAGS::=-g -std=c++17 -Wall -pedantic -Wextra EXT::=cpp MAIN_LIBRARY::=test +DLLOUT::=$(MAIN_LIBRARY).dll SHARED?=1 ifneq ($(WINDOWS),1) @@ -46,7 +47,6 @@ else #windows RANLIB?=$(MINGW_PREFIX)ranlib AR?=$(MINGW_PREFIX)ar AS?=$(MINGW_PREFIX)as - DLLOUT::=$(MAIN_LIBRARY).dll endif #windows ifeq ($(SHARED),1) @@ -93,7 +93,7 @@ ifeq ($(SHARED),1) ifeq ($(WINDOWS),1) all: $(DLLOUT) $(INTERNAL_MAIN_LIBRARY): $(OBJECTS) - $(CXX) -shared -o "$(DLLOUT)" $^ -Wl,--out-implib,"$(INTERNAL_MAIN_LIBRARY)" $(LDLIBS) $(LDFLAGS) + $(CXX) -shared -o "$(DLLOUT)" $^ -Wl,--out-implib,"lib$(MAIN_LIBRARY).a" $(LDLIBS) $(LDFLAGS) $(DLLOUT): $(INTERNAL_MAIN_LIBRARY) else #windows $(INTERNAL_MAIN_LIBRARY): $(OBJECTS)