Merge pull request #478 from krzys-h/fix-msvc2017-makefile

Fix multithreaded make with MSVC2017
This commit is contained in:
Twinaphex 2019-01-05 21:44:15 +01:00 committed by GitHub
commit c20eac9a75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -445,7 +445,8 @@ else ifneq (,$(findstring windows_msvc2017,$(platform)))
export INCLUDE := $(INCLUDE);$(WindowsSDKSharedIncludeDir);$(WindowsSDKUCRTIncludeDir);$(WindowsSDKUMIncludeDir) export INCLUDE := $(INCLUDE);$(WindowsSDKSharedIncludeDir);$(WindowsSDKUCRTIncludeDir);$(WindowsSDKUMIncludeDir)
export LIB := $(LIB);$(WindowsSDKUCRTLibDir);$(WindowsSDKUMLibDir) export LIB := $(LIB);$(WindowsSDKUCRTLibDir);$(WindowsSDKUMLibDir)
TARGET := $(TARGET_NAME)_libretro.dll $(TARGET_NAME)_libretro.lib $(TARGET_NAME)_libretro.pdb $(TARGET_NAME)_libretro.exp TARGET := $(TARGET_NAME)_libretro.dll
TARGET_TMP := $(TARGET_NAME)_libretro.lib $(TARGET_NAME)_libretro.pdb $(TARGET_NAME)_libretro.exp
PSS_STYLE :=2 PSS_STYLE :=2
LDFLAGS += -DLL LDFLAGS += -DLL
@ -619,6 +620,6 @@ clean:
@echo rm -f *.o @echo rm -f *.o
@rm -f $(DEPS) @rm -f $(DEPS)
@echo rm -f *.d @echo rm -f *.d
rm -f $(TARGET) rm -f $(TARGET) $(TARGET_TMP)
.PHONY: clean .PHONY: clean