Unverified Commit 006ebadb authored by Libretro-Admin's avatar Libretro-Admin Committed by GitHub
Browse files

Merge pull request #143 from jdgleaver/msvc-fix

Fix msvc2005/msvc2010 builds
parents ddd8b710 aaa981d9
Pipeline #14204 passed with stages
in 26 minutes and 11 seconds
......@@ -465,6 +465,9 @@ else ifeq ($(platform), gcw0)
CFLAGS += $(PTHREAD_FLAGS)
CFLAGS += -ffast-math -march=mips32 -mtune=mips32r2 -mhard-float
else ifeq ($(platform), msvc)
OBJOUT = -Fo
# Nintendo Switch (libtransistor)
else ifeq ($(platform), switch)
EXT=a
......
......@@ -59,7 +59,6 @@ SOEXT = .dll
# Platform setup
STATIC_LINKING = 0
platform = win
PLATDEFS =
PLATCFLAGS = -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 -DWIN32 -DCORRECT_VRAM_READS -D_WINDOWS -D_USRDLL -D_CRT_SECURE_NO_WARNINGS -DMSVC2010_EXPORTS -DFRONTEND_SUPPORTS_RGB565 -DGIT_VERSION=\"$(GIT_VERSION)\"
PLATCXXFLAGS = $(PLATCFLAGS)
......@@ -69,7 +68,7 @@ PLATCXXFLAGS = $(PLATCFLAGS)
################
# libretro setup
RETRODEFS = -D__LIBRETRO__ -wd4710 -wd4711 -wd4127 -wd4204 -wd4242 -wd4244 -wd4820 -wd4214 -wd4100 -wd4738 -wd4706 -wd4668 -wd4245 -wd4255 -wd4389 -wd4305 -wd4113
RETRODEFS = -D__LIBRETRO__ -DHAVE_NO_LANGEXTRA -wd4710 -wd4711 -wd4127 -wd4204 -wd4242 -wd4244 -wd4820 -wd4214 -wd4100 -wd4738 -wd4706 -wd4668 -wd4245 -wd4255 -wd4389 -wd4305 -wd4113
RETROCFLAGS =
RETROCXXFLAGS =
RETROLDFLAGS =
......
......@@ -58,7 +58,6 @@ SOEXT = .dll
# Platform setup
STATIC_LINKING = 0
platform = win
PLATDEFS =
PLATCFLAGS = -DWIN32 -DCORRECT_VRAM_READS -D_WINDOWS -D_USRDLL -D_CRT_SECURE_NO_WARNINGS -DMSVC2010_EXPORTS -DFRONTEND_SUPPORTS_RGB565 -DGIT_VERSION=\"$(GIT_VERSION)\"
PLATCXXFLAGS = $(PLATCFLAGS)
......
......@@ -58,7 +58,6 @@ SOEXT = .dll
# Platform setup
STATIC_LINKING = 0
platform = win
PLATDEFS =
PLATCFLAGS = -DWIN32 -DCORRECT_VRAM_READS -D_WINDOWS -D_USRDLL -D_CRT_SECURE_NO_WARNINGS -DMSVC2010_EXPORTS -DFRONTEND_SUPPORTS_RGB565 -DGIT_VERSION=\"$(GIT_VERSION)\"
PLATCXXFLAGS = $(PLATCFLAGS)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment