From 290b1f92ce9840770de0d312ea62c6fea9430305 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 27 Dec 2018 19:52:31 +0100 Subject: [PATCH] Add MSVC2008 target --- Makefile.common | 6 +----- Makefile.libretro | 25 ++++++++++++++++++++++--- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/Makefile.common b/Makefile.common index 36127ad..9ee013b 100644 --- a/Makefile.common +++ b/Makefile.common @@ -3,11 +3,7 @@ INCFLAGS := -I$(CORE_DIR)/drivers/libretro -I$(LIBRETRO_COMM_DIR)/include - COREDEFINES = -D__LIBRETRO__ -DSOUND_QUALITY=0 -DPATH_MAX=1024 -DFCEU_VERSION_NUMERIC=9813 -DFRONTEND_SUPPORTS_RGB565 INCLUDE_STDINT = 0 -ifneq (,$(findstring msvc2003,$(platform))) -INCLUDE_STDINT = 1 -endif - -ifneq (,$(findstring msvc2005,$(platform))) +ifneq (,$(findstring msvc200,$(platform))) INCLUDE_STDINT = 1 endif diff --git a/Makefile.libretro b/Makefile.libretro index 3a27cb9..ab3908c 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -543,6 +543,26 @@ CXXFLAGS += -D_XBOX -D_XBOX360 ENDIANNESS_DEFINES += -DMSB_FIRST STATIC_LINKING=1 +# Windows MSVC 2008 x86 +else ifeq ($(platform), windows_msvc2008_x86) + CC = cl.exe + CXX = cl.exe + +PATH := $(shell IFS=$$'\n'; cygpath "$(VS90COMNTOOLS)../../VC/bin"):$(PATH) +PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS90COMNTOOLS)../IDE") +INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS90COMNTOOLS)../../VC/include") +LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS90COMNTOOLS)../../VC/lib") +BIN := $(shell IFS=$$'\n'; cygpath "$(VS90COMNTOOLS)../../VC/bin") + +WindowsSdkDir := $(INETSDK) + +export INCLUDE := $(INCLUDE);$(INETSDK)/Include +export LIB := $(LIB);$(WindowsSdkDir);$(INETSDK)/Lib +TARGET := $(TARGET_NAME)_libretro.dll +PSS_STYLE :=2 +LDFLAGS += -DLL +CFLAGS += -D_CRT_SECURE_NO_DEPRECATE + # Windows MSVC 2005 x86 else ifeq ($(platform), windows_msvc2005_x86) CC = cl.exe @@ -556,7 +576,7 @@ BIN := $(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../../VC/bin") WindowsSdkDir := $(INETSDK) -export INCLUDE := $(INCLUDE);$(INETSDK)/Include;src/drivers/libretro/msvc/msvc-2005 +export INCLUDE := $(INCLUDE);$(INETSDK)/Include export LIB := $(LIB);$(WindowsSdkDir);$(INETSDK)/Lib TARGET := $(TARGET_NAME)_libretro.dll PSS_STYLE :=2 @@ -576,7 +596,7 @@ BIN := $(shell IFS=$$'\n'; cygpath "$(VS71COMNTOOLS)../../Vc7/bin") WindowsSdkDir := $(INETSDK) -export INCLUDE := $(INCLUDE);$(INETSDK)/Include;src/drivers/libretro/msvc/msvc-2005 +export INCLUDE := $(INCLUDE);$(INETSDK)/Include export LIB := $(LIB);$(WindowsSdkDir);$(INETSDK)/Lib TARGET := $(TARGET_NAME)_libretro.dll PSS_STYLE :=2 @@ -704,7 +724,6 @@ endif else $(LD) $(LINKOUT)$@ $(SHARED) $(OBJECTS) $(LDFLAGS) $(LIBS) endif - @echo "** BUILD SUCCESSFUL! GG NO RE **" %.o: %.c $(CC) -c $(OBJOUT)$@ $< $(CFLAGS) $(INCFLAGS)