Fixed windows clean target and shared library build
This commit is contained in:
parent
3f2d635b8e
commit
8e763741d5
@ -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)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user