From f862dc8b142a8a77f4d27f2561c47eeb944b2569 Mon Sep 17 00:00:00 2001 From: jdgleaver Date: Fri, 12 Feb 2021 11:46:55 +0000 Subject: [PATCH] (.gitlab-ci.yml) Add windows-msvc05-i686 target --- .gitlab-ci.yml | 42 ++++++++++++++++++++++++++++++++++++++++++ Makefile.griffin | 30 +++++++++++++++++++++++++++--- 2 files changed, 69 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 186faa349f..3c7f6479e4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -170,6 +170,48 @@ build-retroarch-windows-msvc10-i686: - copypedeps.exe -r retroarch.exe "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/redist" - Remove-Item "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/redist/retroarch.exe" -ErrorAction Ignore +build-retroarch-windows-msvc05-i686: + tags: + - win10 + stage: build + variables: + MEDIA_PATH: .media + MSYSTEM: MINGW32 + ARCH: x86 + MSYS_BIN_DIR: C:\msys64\usr\bin + SDK_BIN_DIR: C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin + PEDEPS_BIN_DIR: C:\Program Files\pedeps-0.1.9-win64\bin + VS80COMNTOOLS: C:\Program Files (x86)\Microsoft Visual Studio 8\Common7\Tools\ + before_script: + - $Env:HOME = "." + - $Env:Path += -join(";", "$Env:SDK_BIN_DIR", ";", "$Env:PEDEPS_BIN_DIR") + artifacts: + paths: + - retroarch.exe + - ${MEDIA_PATH} + expire_in: 10 min + dependencies: [] + script: + # Build RetroArch + - $Script:MakeCmd = "$Env:MSYS_BIN_DIR\env.exe $Env:MSYS_BIN_DIR\bash.exe -l -c 'make -f Makefile.griffin platform=windows_msvc2005_x86'" + - Invoke-Expression $Script:MakeCmd + - mt.exe -nologo -manifest "retroarch.exe.manifest" -outputresource:"retroarch.exe;#1" + # Create .media subdirectories + - New-Item -Path "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/filters/audio" -ItemType Directory + - New-Item -Path "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/filters/video" -ItemType Directory + - New-Item -Path "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/pkg" -ItemType Directory + - New-Item -Path "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/redist" -ItemType Directory + # Copy audio/video filters + - Get-ChildItem -Path "libretro-common/audio/dsp_filters/*" -Include *.dsp | Copy-Item -Destination "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/filters/audio" + - Get-ChildItem -Path "gfx/video_filters/*" -Include *.filt | Copy-Item -Destination "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/filters/video" + # Copy default config file + - Copy-Item -Path "retroarch.cfg" -Destination "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/pkg/retroarch.default.cfg" + # Copy dll dependencies + # (note that msvc05 build should not have any, but this + # may change in the future) + - copypedeps.exe -r retroarch.exe "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/redist" + - Remove-Item "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/redist/retroarch.exe" -ErrorAction Ignore + build-retroarch-linux-x64: image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-amd64-ubuntu:xenial-gcc9 stage: build diff --git a/Makefile.griffin b/Makefile.griffin index b5231c9a60..a86ca2844d 100644 --- a/Makefile.griffin +++ b/Makefile.griffin @@ -448,6 +448,7 @@ else ifeq ($(platform), windows_msvc2003_x86) endif else ifeq ($(platform), windows_msvc2005_x86) HAVE_GDI := 1 + HAVE_REWIND := 1 HAVE_RPNG := 1 HAVE_RJPEG := 1 HAVE_RBMP := 1 @@ -461,6 +462,7 @@ else ifeq ($(platform), windows_msvc2005_x86) HAVE_VIDEO_LAYOUT := 0 HAVE_MATERIALUI := 1 HAVE_XMB := 1 + HAVE_OZONE := 1 HAVE_STB_FONT := 1 HAVE_THREADS := 1 HAVE_LIBRETRODB := 1 @@ -470,10 +472,16 @@ else ifeq ($(platform), windows_msvc2005_x86) HAVE_DYLIB := 1 HAVE_DYNAMIC := 1 HAVE_GRIFFIN_CPP := 1 + HAVE_RUNAHEAD := 1 HAVE_DIRECTX ?= 1 + HAVE_OPENGL := 1 + HAVE_OPENGL1 := 1 HAVE_CONFIGFILE := 1 HAVE_PATCH := 1 HAVE_CHEATS := 1 + HAVE_DSP_FILTER := 1 + HAVE_VIDEO_FILTER := 1 + HAVE_FILTERS_BUILTIN := 1 HAVE_GFX_WIDGETS := 1 EXT_TARGET := $(TARGET_NAME).exe @@ -482,16 +490,32 @@ else ifeq ($(platform), windows_msvc2005_x86) CXX = cl.exe LD = link.exe - PLATCFLAGS += -D_WIN32 -D_WIN32_WINNT=0x0410 -D__STDC_CONSTANT_MACROS -D_MBCS -D__MMX__ -D__SSE__ -DHAVE_OPENGL -DHAVE_OPENGL1 -DHAVE_GLSL -DHAVE_SHADERPIPELINE -DHAVE_OZONE -DHAVE_GFX_WIDGETS - LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib msimg32.lib + PLATCFLAGS += -D_WIN32 -D_WIN32_WINNT=0x0410 -D__STDC_CONSTANT_MACROS -D_MBCS -D__SSE__ + PLATCFLAGS += -DHAVE_OPENGL -DHAVE_OPENGL1 -DHAVE_GLSL -DHAVE_OZONE -DHAVE_GFX_WIDGETS -DHAVE_CC_RESAMPLER + PLATCFLAGS += -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DHAVE_CDROM + PLATCFLAGS += -bigobj + + LDFLAGS += -MANIFEST shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib msimg32.lib PATH := $(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../../VC/bin"):$(PATH) PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../IDE") INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VS80COMNTOOLS)../../VC/include") LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS80COMNTOOLS)../../VC/lib") + WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\MicrosoftSDK\InstalledSDKs\8F9E5EF3-A9A5-491B-A889-C58EFFECE8B3" -v "Install Dir" | grep -o '[A-Z]:\\.*') + + WindowsSDKIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include") + WindowsSDKAtlIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\atl") + WindowsSDKCrtIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\crt") + WindowsSDKGlIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\gl") + WindowsSDKMfcIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\mfc") + WindowsSDKLibDir := $(shell cygpath -w "$(WindowsSdkDir)\Lib") + + INCLUDE := $(INCLUDE);$(WindowsSDKIncludeDir);$(WindowsSDKAtlIncludeDir);$(WindowsSDKCrtIncludeDir);$(WindowsSDKGlIncludeDir);$(WindowsSDKMfcIncludeDir);libretro/msvc/msvc-2005 + LIB := $(LIB);$(WindowsSDKLibDir) + ifeq ($(HAVE_DIRECTX), 1) - PLATCFLAGS += -DHAVE_DINPUT -DHAVE_DSOUND + PLATCFLAGS += -DHAVE_DINPUT -DHAVE_DSOUND -DHAVE_D3D -DHAVE_D3D8 DXSDK_DIR := $(DXSDK_DIR:\=) export INCLUDE := $(INCLUDE);$(INETSDK)\Include;$(DXSDK_DIR)\Include;libretro-common\include;libretro-common\include\compat\msvc;gfx\include;deps;deps\stb export LIB := $(LIB);$(INETSDK)\Lib;$(DXSDK_DIR)\Lib\x86