Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Libretro
libretro-2048
Commits
fb8a484a
Commit
fb8a484a
authored
Jan 20, 2021
by
Libretro-Admin
Browse files
Add msvc10 x64 support
parent
f3e9ea6a
Pipeline
#11452
failed with stages
in 2 minutes and 23 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
fb8a484a
...
...
@@ -17,6 +17,10 @@ include:
# Windows 64-bit
-
project
:
'
libretro-infrastructure/ci-templates'
file
:
'
/windows-x64-mingw.yml'
# Windows msvc10 64-bit
-
project
:
'
libretro-infrastructure/ci-templates'
file
:
'
/windows-x64-msvc10.yml'
# Windows 32-bit
-
project
:
'
libretro-infrastructure/ci-templates'
...
...
@@ -106,6 +110,14 @@ libretro-build-windows-x64:
-
.libretro-windows-x64-mingw-make-default
-
.core-defs
# Windows msvc10 64-bit
libretro-build-windows-msvc10-x64
:
extends
:
-
.libretro-windows-x64-msvc10-make-default
-
.core-defs
variables
:
PREINITIALIZED
:
1
# Windows 32-bit
libretro-build-windows-i686
:
extends
:
...
...
Makefile.libretro
View file @
fb8a484a
STATIC_LINKING
=
0
PREINITIALIZED
:=
0
ifeq
($(platform),)
ifeq
($(shell uname -s),)
platform
=
win
else
ifneq
($(findstring MINGW,$(shell uname -a)),)
platform
=
win
else
ifneq
($(findstring Darwin,$(shell uname -a)),)
platform
=
osx
else
ifneq
($(findstring win,$(shell uname -a)),)
platform
=
win
else
platform
=
unix
endif
endif
# platform
ifeq
($(platform),)
platform
=
unix
ifeq
($(shell uname -s),)
...
...
@@ -22,10 +10,6 @@ else ifneq ($(findstring MINGW,$(shell uname -s)),)
platform
=
win
else
ifneq
($(findstring Darwin,$(shell uname -s)),)
platform
=
osx
arch
=
intel
ifeq
($(shell uname -p),powerpc)
arch
=
ppc
endif
else
ifneq
($(findstring win,$(shell uname -s)),)
platform
=
win
endif
...
...
@@ -354,6 +338,11 @@ HAS_GCC := 0
# Windows MSVC 2010 x64
else
ifeq
($(platform), windows_msvc2010_x64)
ifeq
($(PREINITIALIZED),1)
CC
?=
cl.exe
CXX
?=
cl.exe
else
CC
=
cl.exe
CXX
=
cl.exe
...
...
@@ -372,6 +361,8 @@ WindowsSdkDirInc ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Wi
INCFLAGS_PLATFORM
=
-I
"
$(WindowsSdkDirInc)
"
export
INCLUDE
:=
$(INCLUDE)
export
LIB
:=
$(LIB)
;
$(WindowsSdkDir)
endif
TARGET
:=
$(TARGET_NAME)
_libretro.dll
PSS_STYLE
:=
2
LDFLAGS
+=
-DLL
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment