rexy712/makefile
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed windows clean target and shared library build

Browse Source
This commit is contained in:
rexy712 2019-09-13 17:37:12 -07:00
parent 3f2d635b8e
commit 8e763741d5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makefile.library
View File

@ -27,6 +27,7 @@ INCLUDE_DIRS::=include
CXXFLAGS::=-g -std=c++17 -Wall -pedantic -Wextra CXXFLAGS::=-g -std=c++17 -Wall -pedantic -Wextra
EXT::=cpp EXT::=cpp
MAIN_LIBRARY::=test MAIN_LIBRARY::=test
DLLOUT::=$(MAIN_LIBRARY).dll
SHARED?=1 SHARED?=1
ifneq ($(WINDOWS),1) ifneq ($(WINDOWS),1)
@ -46,7 +47,6 @@ else #windows
RANLIB?=$(MINGW_PREFIX)ranlib RANLIB?=$(MINGW_PREFIX)ranlib
AR?=$(MINGW_PREFIX)ar AR?=$(MINGW_PREFIX)ar
AS?=$(MINGW_PREFIX)as AS?=$(MINGW_PREFIX)as
DLLOUT::=$(MAIN_LIBRARY).dll
endif #windows endif #windows
ifeq ($(SHARED),1) ifeq ($(SHARED),1)
@ -93,7 +93,7 @@ ifeq ($(SHARED),1)
ifeq ($(WINDOWS),1) ifeq ($(WINDOWS),1)
all: $(DLLOUT) all: $(DLLOUT)
$(INTERNAL_MAIN_LIBRARY): $(OBJECTS) $(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) $(DLLOUT): $(INTERNAL_MAIN_LIBRARY)
else #windows else #windows
$(INTERNAL_MAIN_LIBRARY): $(OBJECTS) $(INTERNAL_MAIN_LIBRARY): $(OBJECTS)