Skip to content

Commit ebd397f

Browse files
XerTheSquirrelXerTheSquirrel
committed
Merge branch 'master' of github.com:libretro/Mu
2 parents f631649 + 5795ade commit ebd397f

11 files changed

+175
-83
lines changed

‎.gitlab-ci.yml

Lines changed: 73 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,26 @@
1313
# Inclusion templates, required for the build to work
1414
include:
1515
################################## DESKTOPS ################################
16+
# Windows 64-bit
17+
- project: 'libretro-infrastructure/ci-templates'
18+
file: '/windows-x64-mingw.yml'
19+
20+
# Windows 32-bit
21+
- project: 'libretro-infrastructure/ci-templates'
22+
file: '/windows-i686-mingw.yml'
23+
24+
# Windows msvc10 64-bit
25+
- project: 'libretro-infrastructure/ci-templates'
26+
file: '/windows-x64-msvc10-msys2.yml'
27+
28+
# Windows msvc10 32-bit
29+
- project: 'libretro-infrastructure/ci-templates'
30+
file: '/windows-i686-msvc10-msys2.yml'
31+
32+
# Windows msvc05 32-bit
33+
- project: 'libretro-infrastructure/ci-templates'
34+
file: '/windows-i686-msvc05-msys2.yml'
35+
1636
# Linux 64-bit
1737
- project: 'libretro-infrastructure/ci-templates'
1838
file: '/linux-x64.yml'
@@ -21,15 +41,15 @@ include:
2141
- project: 'libretro-infrastructure/ci-templates'
2242
file: '/osx-x64.yml'
2343

24-
# Windows 64-bit
25-
- project: 'libretro-infrastructure/ci-templates'
26-
file: '/windows-x64-mingw.yml'
27-
2844
################################## CELLULAR ################################
2945
# Android
3046
- project: 'libretro-infrastructure/ci-templates'
3147
file: '/android-jni.yml'
3248

49+
# iOS 9
50+
- project: 'libretro-infrastructure/ci-templates'
51+
file: '/ios9.yml'
52+
3353
################################## CONSOLES ################################
3454
# Dingux (GCW Zero)
3555
- project: 'libretro-infrastructure/ci-templates'
@@ -55,10 +75,6 @@ include:
5575
- project: 'libretro-infrastructure/ci-templates'
5676
file: '/libnx-static.yml'
5777

58-
# Nintendo Wii U
59-
- project: 'libretro-infrastructure/ci-templates'
60-
file: '/wiiu-static.yml'
61-
6278
# PLayStation 2
6379
- project: 'libretro-infrastructure/ci-templates'
6480
file: '/ps2-static.yml'
@@ -67,6 +83,11 @@ include:
6783
- project: 'libretro-infrastructure/ci-templates'
6884
file: '/vita-static.yml'
6985

86+
#################################### MISC ##################################
87+
# Emscripten
88+
- project: 'libretro-infrastructure/ci-templates'
89+
file: '/emscripten-static.yml'
90+
7091
# Stages for building
7192
stages:
7293
- build-prepare
@@ -78,6 +99,36 @@ stages:
7899
##############################################################################
79100

80101
################################### DESKTOPS #################################
102+
# Windows 64-bit
103+
libretro-build-windows-x64:
104+
extends:
105+
- .libretro-windows-x64-mingw-make-default
106+
- .core-defs
107+
108+
# Windows 32-bit
109+
libretro-build-windows-i686:
110+
extends:
111+
- .libretro-windows-i686-mingw-make-default
112+
- .core-defs
113+
114+
# Windows msvc10 64-bit
115+
libretro-build-windows-msvc10-x64:
116+
extends:
117+
- .libretro-windows-x64-msvc10-msys2-make-default
118+
- .core-defs
119+
120+
# Windows msvc10 32-bit
121+
libretro-build-windows-msvc10-i686:
122+
extends:
123+
- .libretro-windows-i686-msvc10-msys2-make-default
124+
- .core-defs
125+
126+
# Windows msvc05 32-bit
127+
libretro-build-windows-msvc05-i686:
128+
extends:
129+
- .libretro-windows-i686-msvc05-msys2-make-default
130+
- .core-defs
131+
81132
# Linux 64-bit
82133
libretro-build-linux-x64:
83134
extends:
@@ -90,12 +141,6 @@ libretro-build-osx-x64:
90141
- .libretro-osx-x64-make-default
91142
- .core-defs
92143

93-
# Windows 64-bit
94-
libretro-build-windows-x64:
95-
extends:
96-
- .libretro-windows-x64-mingw-make-default
97-
- .core-defs
98-
99144
################################### CELLULAR #################################
100145
# Android ARMv7a
101146
android-armeabi-v7a:
@@ -121,6 +166,12 @@ android-x86:
121166
- .libretro-android-jni-x86
122167
- .core-defs
123168

169+
# iOS 9
170+
libretro-build-ios9:
171+
extends:
172+
- .libretro-ios9-make-default
173+
- .core-defs
174+
124175
################################### CONSOLES #################################
125176
# Dingux (GCW Zero)
126177
libretro-build-dingux:
@@ -129,7 +180,7 @@ libretro-build-dingux:
129180
- .core-defs
130181

131182
# Nintendo 3DS
132-
libretro-build-3ds:
183+
libretro-build-ctr:
133184
extends:
134185
- .libretro-ctr-static-retroarch-master
135186
- .core-defs
@@ -169,3 +220,10 @@ libretro-build-vita:
169220
extends:
170221
- .libretro-vita-static-retroarch-master
171222
- .core-defs
223+
224+
#################################### MISC ##################################
225+
# Emscripten
226+
libretro-build-emscripten:
227+
extends:
228+
- .libretro-emscripten-static-retroarch-master
229+
- .core-defs

‎include/portability.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#endif
2929

3030
// PS2 is lacking intmax_t and uintmax_t!
31-
#if defined(PS2) && !defined(UINTMAX_MAX)
31+
#if !defined(UINTMAX_MAX)
3232
typedef intmax_t signed long long int;
3333
typedef uintmax_t unsigned long long int;
3434

‎include/pxa260/pxa260_LCD.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "pxa260_CPU.h"
55
#include "pxa260_IC.h"
66

7-
uint16_t* pxa260Framebuffer;
7+
extern uint16_t* pxa260Framebuffer;
88

99
/*
1010
PXA260 OS LCD controller

‎libretroBuildSystem/Makefile.libretro

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -454,11 +454,10 @@ else ifeq ($(platform), xbox1_msvc2003)
454454
# PlayStation 2
455455
else ifeq ($(platform), ps2)
456456
TARGET := $(TARGET_NAME)_libretro_$(platform).a
457-
CC = ee-gcc$(EXE_EXT)
458-
CXX = ee-g++$(EXE_EXT)
459-
AR = ee-ar$(EXE_EXT)
460-
CFLAGS += -Wall -DPS2 -DNO_UNALIGNED_ACCESS -DABGR1555 -DRENDER_GSKIT_PS2 -fsingle-precision-constant
461-
CFLAGS += -I$(PS2SDK)/ee/include -I$(PS2SDK)/common/include -I$(PS2DEV)/gsKit/include
457+
CC = mips64r5900el-ps2-elf-gcc$(EXE_EXT)
458+
CXX = mips64r5900el-ps2-elf-g++$(EXE_EXT)
459+
AR = mips64r5900el-ps2-elf-ar$(EXE_EXT)
460+
CFLAGS += -Wall -DPS2 -DABGR1555
462461
STATIC_LINKING = 1
463462
STATIC_LINKING_LINK = 1
464463

‎libretroBuildSystem/build/Makefile.windows_msvc2003_x86

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,8 @@ SOEXT = .dll
5353
# Platform setup
5454

5555
STATIC_LINKING = 0
56-
platform = win
5756
PLATDEFS =
58-
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)\"
57+
PLATCFLAGS = -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 -DWIN32 -D_WINDOWS -D_USRDLL -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -DFRONTEND_SUPPORTS_RGB565 -DGIT_VERSION=\"$(GIT_VERSION)\"
5958
PLATCXXFLAGS = $(PLATCFLAGS)
6059
#PLATLDFLAGS = -shared -lm
6160
#PLATLDXFLAGS = -shared -lm
@@ -82,13 +81,17 @@ LDXFLAGS = $(PLATLDXFLAGS) $(RETROLDXFLAGS)
8281
# Tuning
8382

8483
ifeq ($(DEBUG),1)
85-
CFLAGS += -Od -Zi -D_DEBUG
86-
CXXFLAGS += -Od -Zi -D_DEBUG
87-
LDFLAGS += -DEBUG -DLL
84+
CFLAGS += -Od -Zi -D_DEBUG
85+
CXXFLAGS += -Od -Zi -D_DEBUG
86+
CFLAGS += -MTd
87+
CXXFLAGS += -MTd
88+
LDFLAGS += -DEBUG -DLL
8889
else
89-
CFLAGS += -O2 -DNDEBUG
90-
CXXFLAGS += -O2 -DNDEBUG
91-
LDFLAGS += -DLL
90+
CFLAGS += -O2 -DNDEBUG
91+
CXXFLAGS += -O2 -DNDEBUG
92+
CFLAGS += -MT
93+
CXXFLAGS += -MT
94+
LDFLAGS += -DLL
9295
endif
9396

9497
ifneq ($(LOG_PERFORMANCE),)

‎libretroBuildSystem/build/Makefile.windows_msvc2005_x86

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,17 @@ PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../IDE")
3737
INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../../VC/include")
3838
LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS80COMNTOOLS)../../VC/lib")
3939

40-
WindowsSdkDir := $(INETSDK)
40+
WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\MicrosoftSDK\InstalledSDKs\8F9E5EF3-A9A5-491B-A889-C58EFFECE8B3" -v "Install Dir" | grep -o '[A-Z]:\\.*')
4141

42-
export INCLUDE := $(INCLUDE);$(WindowsSdkDir)/Include;libretro/msvc/msvc-2005
43-
export LIB := $(LIB);$(WindowsSdkDir);$(INETSDK)/Lib
42+
WindowsSDKIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include")
43+
WindowsSDKAtlIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\atl")
44+
WindowsSDKCrtIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\crt")
45+
WindowsSDKGlIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\gl")
46+
WindowsSDKMfcIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\mfc")
47+
WindowsSDKLibDir := $(shell cygpath -w "$(WindowsSdkDir)\Lib")
48+
49+
export INCLUDE := $(INCLUDE);$(WindowsSDKIncludeDir);$(WindowsSDKAtlIncludeDir);$(WindowsSDKCrtIncludeDir);$(WindowsSDKGlIncludeDir);$(WindowsSDKMfcIncludeDir);libretro-common/include/compat/msvc
50+
export LIB := $(LIB);$(WindowsSDKLibDir)
4451

4552
############
4653
# Extensions
@@ -52,9 +59,8 @@ SOEXT = .dll
5259
# Platform setup
5360

5461
STATIC_LINKING = 0
55-
platform = win
5662
PLATDEFS =
57-
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)\"
63+
PLATCFLAGS = -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 -DWIN32 -D_WINDOWS -D_USRDLL -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -DFRONTEND_SUPPORTS_RGB565 -DGIT_VERSION=\"$(GIT_VERSION)\"
5864
PLATCXXFLAGS = $(PLATCFLAGS)
5965
#PLATLDFLAGS = -shared -lm
6066
#PLATLDXFLAGS = -shared -lm
@@ -81,13 +87,17 @@ LDXFLAGS = $(PLATLDXFLAGS) $(RETROLDXFLAGS)
8187
# Tuning
8288

8389
ifeq ($(DEBUG),1)
84-
CFLAGS += -Od -Zi -D_DEBUG
85-
CXXFLAGS += -Od -Zi -D_DEBUG
86-
LDFLAGS += -DEBUG -DLL
90+
CFLAGS += -Od -Zi -D_DEBUG
91+
CXXFLAGS += -Od -Zi -D_DEBUG
92+
CFLAGS += -MTd
93+
CXXFLAGS += -MTd
94+
LDFLAGS += -DEBUG -DLL
8795
else
88-
CFLAGS += -O2 -DNDEBUG
89-
CXXFLAGS += -O2 -DNDEBUG
90-
LDFLAGS += -DLL
96+
CFLAGS += -O2 -DNDEBUG
97+
CXXFLAGS += -O2 -DNDEBUG
98+
CFLAGS += -MT
99+
CXXFLAGS += -MT
100+
LDFLAGS += -DLL
91101
endif
92102

93103
ifneq ($(LOG_PERFORMANCE),)

‎libretroBuildSystem/build/Makefile.windows_msvc2008_x86

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,8 @@ SOEXT = .dll
5252
# Platform setup
5353

5454
STATIC_LINKING = 0
55-
platform = win
5655
PLATDEFS =
57-
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)\"
56+
PLATCFLAGS = -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 -DWIN32 -D_WINDOWS -D_USRDLL -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -DFRONTEND_SUPPORTS_RGB565 -DGIT_VERSION=\"$(GIT_VERSION)\"
5857
PLATCXXFLAGS = $(PLATCFLAGS)
5958
#PLATLDFLAGS = -shared -lm
6059
#PLATLDXFLAGS = -shared -lm
@@ -81,13 +80,17 @@ LDXFLAGS = $(PLATLDXFLAGS) $(RETROLDXFLAGS)
8180
# Tuning
8281

8382
ifeq ($(DEBUG),1)
84-
CFLAGS += -Od -Zi -D_DEBUG
85-
CXXFLAGS += -Od -Zi -D_DEBUG
86-
LDFLAGS += -DEBUG -DLL
83+
CFLAGS += -Od -Zi -D_DEBUG
84+
CXXFLAGS += -Od -Zi -D_DEBUG
85+
CFLAGS += -MTd
86+
CXXFLAGS += -MTd
87+
LDFLAGS += -DEBUG -DLL
8788
else
88-
CFLAGS += -O2 -DNDEBUG
89-
CXXFLAGS += -O2 -DNDEBUG
90-
LDFLAGS += -DLL
89+
CFLAGS += -O2 -DNDEBUG
90+
CXXFLAGS += -O2 -DNDEBUG
91+
CFLAGS += -MT
92+
CXXFLAGS += -MT
93+
LDFLAGS += -DLL
9194
endif
9295

9396
ifneq ($(LOG_PERFORMANCE),)

‎libretroBuildSystem/build/Makefile.windows_msvc2010_x64

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,16 @@ PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../IDE")
3737
INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/include")
3838
LIB := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/lib/amd64")
3939

40-
WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')
41-
WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')
40+
WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')
41+
WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')
4242

43-
export INCLUDE := $(INCLUDE);$(WindowsSdkDir)Include
44-
export LIB := $(LIB);$(WindowsSdkDir)Lib/x64
43+
WindowsSDKIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include")
44+
WindowsSDKGlIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\gl")
45+
WindowsSDKLibDir := $(shell cygpath -w "$(WindowsSdkDir)\Lib\x64")
46+
47+
INCFLAGS_PLATFORM = -I"$(WindowsSdkDirInc)"
48+
export INCLUDE := $(INCLUDE);$(WindowsSDKIncludeDir);$(WindowsSDKGlIncludeDir)
49+
export LIB := $(LIB);$(WindowsSDKLibDir)
4550

4651
############
4752
# Extensions
@@ -53,9 +58,8 @@ SOEXT = .dll
5358
# Platform setup
5459

5560
STATIC_LINKING = 0
56-
platform = win
5761
PLATDEFS =
58-
PLATCFLAGS = -DWIN32 -DCORRECT_VRAM_READS -D_WINDOWS -D_USRDLL -D_CRT_SECURE_NO_WARNINGS -DMSVC2010_EXPORTS -DFRONTEND_SUPPORTS_RGB565 -DGIT_VERSION=\"$(GIT_VERSION)\"
62+
PLATCFLAGS = -DWIN32 -D_WINDOWS -D_USRDLL -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -DMSVC2010_EXPORTS -DFRONTEND_SUPPORTS_RGB565 -DGIT_VERSION=\"$(GIT_VERSION)\"
5963
PLATCXXFLAGS = $(PLATCFLAGS)
6064
#PLATLDFLAGS = -shared -lm
6165
#PLATLDXFLAGS = -shared -lm
@@ -82,13 +86,17 @@ LDXFLAGS = $(PLATLDXFLAGS) $(RETROLDXFLAGS)
8286
# Tuning
8387

8488
ifeq ($(DEBUG),1)
85-
CFLAGS += -Od -Zi -D_DEBUG
86-
CXXFLAGS += -Od -Zi -D_DEBUG
87-
LDFLAGS += -DEBUG -DLL
89+
CFLAGS += -Od -Zi -D_DEBUG
90+
CXXFLAGS += -Od -Zi -D_DEBUG
91+
CFLAGS += -MTd
92+
CXXFLAGS += -MTd
93+
LDFLAGS += -DEBUG -DLL
8894
else
89-
CFLAGS += -O2 -DNDEBUG
90-
CXXFLAGS += -O2 -DNDEBUG
91-
LDFLAGS += -DLL
95+
CFLAGS += -O2 -DNDEBUG
96+
CXXFLAGS += -O2 -DNDEBUG
97+
CFLAGS += -MT
98+
CXXFLAGS += -MT
99+
LDFLAGS += -DLL
92100
endif
93101

94102
ifneq ($(LOG_PERFORMANCE),)

0 commit comments

Comments
 (0)