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
snes9x2010
Commits
0fcbbdc2
Commit
0fcbbdc2
authored
Sep 27, 2021
by
Libretro-Admin
Browse files
Update MSVC
parent
55a0f20e
Pipeline
#55644
failed with stages
in 3 minutes and 55 seconds
Changes
9
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Makefile.libretro
View file @
0fcbbdc2
...
...
@@ -564,9 +564,13 @@ else
endif
COMMON_DEFINES
+=
$(CODE_DEFINES)
$(WARNINGS_DEFINES)
$(fpic)
$(LTO)
LDFLAGS
+=
$(LTO)
CFLAGS
+=
$(DEFINES)
$(COMMON_DEFINES)
OBJOUT
=
-o
LINKOUT
=
-o
ifneq
(,$(findstring msvc,$(platform)))
OBJOUT
=
-Fo
LINKOUT
=
-out
:
...
...
@@ -577,8 +581,6 @@ else
LD
=
link.exe
endif
else
OBJOUT
=
-o
LINKOUT
=
-o
LD
=
$(CC)
endif
...
...
@@ -591,20 +593,14 @@ else
all
:
$(TARGET)
$(TARGET)
:
$(OBJECTS)
ifeq
($(platform), emscripten)
$(CC)
$(CFLAGS)
$(OBJOUT)$@
$^
else
ifeq
($(STATIC_LINKING_LINK),1)
ifneq
(,$(findstring msvc,$(platform)))
$(LD)
$(LINKOUT)
$@
$(OBJECTS)
else
ifeq
($(STATIC_LINKING), 1)
$(AR)
rcs
$@
$(OBJECTS)
endif
else
$(
CC
)
$(
fpic)
$(SHARED)
$(
CFLAGS)
$(INCFLAGS)
$(LDFLAGS)
$(OBJOUT)
$@
$(OBJECTS)
$(LIBM)
$(LTO
)
$(
LD
)
$(
LINKOUT)$@
$(SHARED)
$(
OBJECTS)
$(LDFLAGS)
$(LIBS
)
endif
%.o
:
%.c
+
$(CC)
$(
IN
CFLAGS)
$(CFLAGS)
-c
$(OBJOUT)$@
$<
$(CC)
-c
$(OBJOUT)$@
$<
$(CFLAGS)
$(
IN
CFLAGS)
clean-objs
:
rm
-rf
$(OBJECTS)
...
...
build/Makefile.common
View file @
0fcbbdc2
LIBRETRO_COMM_DIR
:=
$(CORE_DIR)
/libretro/libretro-common
INCFLAGS
:=
-I
$(CORE_DIR)
/libretro
-I
$(CORE_DIR)
/src
-I
$(LIBRETRO_COMM_DIR)
/include
COREDEFINES
=
-DHAVE_STRINGS_H
-DHAVE_INTTYPES_H
-D__LIBRETRO__
-DRIGHTSHIFT_IS_SAR
INCFLAGS
:=
-I
$(CORE_DIR)
/libretro
-I
$(CORE_DIR)
/src
-I
$(LIBRETRO_COMM_DIR)
/include
COREDEFINES
=
-D__LIBRETRO__
-DRIGHTSHIFT_IS_SAR
ifneq
(,$(findstring msvc,$(platform)))
COREDEFINES
+=
-DINLINE
=
_inline
else
COREDEFINES
+=
-DINLINE
=
inline
endif
ifneq
(,$(findstring msvc200,$(platform)))
INCFLAGS
+=
-I
$(LIBRETRO_COMM_DIR)
/include/compat/msvc
...
...
@@ -43,6 +49,7 @@ SOURCES_C += \
$(LIBRETRO_COMM_DIR)
/streams/memory_stream.c
\
$(LIBRETRO_COMM_DIR)
/compat/compat_posix_string.c
\
$(LIBRETRO_COMM_DIR)
/compat/compat_strcasestr.c
\
$(LIBRETRO_COMM_DIR)
/compat/compat_snprintf.c
\
$(LIBRETRO_COMM_DIR)
/compat/compat_strl.c
\
$(LIBRETRO_COMM_DIR)
/compat/fopen_utf8.c
\
$(LIBRETRO_COMM_DIR)
/encodings/encoding_utf.c
\
...
...
build/Makefile.windows_msvc2003_x86
View file @
0fcbbdc2
...
...
@@ -55,7 +55,8 @@ SOEXT = .dll
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
-DFRONTEND_SUPPORTS_RGB565
-DGIT_VERSION
=
\"
$(GIT_VERSION)
\"
PLATCFLAGS
=
-DWINVER
=
0x0400
-D_WIN32_WINNT
=
0x0400
-DWIN32
-D_WINDOWS
-D_USRDLL
-D_CRT_SECURE_NO_WARNINGS
-DFRONTEND_SUPPORTS_RGB565
-DGIT_VERSION
=
\"
$(GIT_VERSION)
\"
PLATCFLAGS
+=
-DCORRECT_VRAM_READS
PLATCXXFLAGS
=
$(PLATCFLAGS)
#PLATLDFLAGS = -shared -lm
#PLATLDXFLAGS = -shared -lm
...
...
build/Makefile.windows_msvc2005_x86
View file @
0fcbbdc2
...
...
@@ -37,7 +37,9 @@ PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../IDE")
INCLUDE
:=
$(
shell
IFS
=
$$
'\n'
;
cygpath
"
$(VS80COMNTOOLS)
../../VC/include"
)
LIB
:=
$(
shell
IFS
=
$$
'\n'
;
cygpath
-w
"
$(VS80COMNTOOLS)
../../VC/lib"
)
WindowsSdkDir
:=
$(
shell
reg query
"HKLM
\S
OFTWARE
\M
icrosoft
\M
icrosoftSDK
\I
nstalledSDKs
\8
F9E5EF3-A9A5-491B-A889-C58EFFECE8B3"
-v
"Install Dir"
|
grep
-o
'[A-Z]:\\.*'
)
#WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\MicrosoftSDK\InstalledSDKs\8F9E5EF3-A9A5-491B-A889-C58EFFECE8B3" -v "Install Dir" | grep -o '[A-Z]:\\.*')
WindowsSdkDir
:=
$(
shell
reg query
"HKLM
\S
OFTWARE
\M
icrosoft
\M
icrosoft SDKs
\W
indows
\v
7.1A"
-v
"InstallationFolder"
|
grep
-o
'[A-Z]:\\.*'
)
WindowsSdkDir
?=
$(
shell
reg query
"HKLM
\S
OFTWARE
\M
icrosoft
\M
icrosoft SDKs
\W
indows
\v
7.0A"
-v
"InstallationFolder"
|
grep
-o
'[A-Z]:\\.*'
)
WindowsSDKIncludeDir
:=
$(
shell
cygpath
-w
"
$(WindowsSdkDir)
\I
nclude"
)
WindowsSDKAtlIncludeDir
:=
$(
shell
cygpath
-w
"
$(WindowsSdkDir)
\I
nclude
\a
tl"
)
...
...
@@ -60,7 +62,8 @@ SOEXT = .dll
STATIC_LINKING
=
0
PLATDEFS
=
PLATCFLAGS
=
-DWINVER
=
0x0400
-D_WIN32_WINNT
=
0x0400
-DWIN32
-DCORRECT_VRAM_READS
-D_WINDOWS
-D_USRDLL
-D_CRT_SECURE_NO_WARNINGS
-DFRONTEND_SUPPORTS_RGB565
-DGIT_VERSION
=
\"
$(GIT_VERSION)
\"
-D_CRT_SECURE_NO_DEPRECATE
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)
\"
PLATCFLAGS
+=
-DCORRECT_VRAM_READS
PLATCXXFLAGS
=
$(PLATCFLAGS)
#PLATLDFLAGS = -shared -lm
#PLATLDXFLAGS = -shared -lm
...
...
@@ -87,16 +90,16 @@ LDXFLAGS = $(PLATLDXFLAGS) $(RETROLDXFLAGS)
# Tuning
ifeq
($(DEBUG),1)
CFLAGS
+=
-MTd
CXXFLAGS
+=
-MTd
CFLAGS
+=
-Od
-Zi
-D_DEBUG
CXXFLAGS
+=
-Od
-Zi
-D_DEBUG
CFLAGS
+=
-MTd
CXXFLAGS
+=
-MTd
LDFLAGS
+=
-DEBUG
-DLL
else
CFLAGS
+=
-MT
CXXFLAGS
+=
-MT
CFLAGS
+=
-O2
-DNDEBUG
CXXFLAGS
+=
-O2
-DNDEBUG
CFLAGS
+=
-MT
CXXFLAGS
+=
-MT
LDFLAGS
+=
-DLL
endif
...
...
build/Makefile.windows_msvc2008_x86
View file @
0fcbbdc2
...
...
@@ -54,7 +54,8 @@ SOEXT = .dll
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
-DFRONTEND_SUPPORTS_RGB565
-DGIT_VERSION
=
\"
$(GIT_VERSION)
\"
PLATCFLAGS
=
-DWINVER
=
0x0400
-D_WIN32_WINNT
=
0x0400
-DWIN32
-D_WINDOWS
-D_USRDLL
-D_CRT_SECURE_NO_WARNINGS
-DFRONTEND_SUPPORTS_RGB565
-DGIT_VERSION
=
\"
$(GIT_VERSION)
\"
PLATCFLAGS
+=
-DCORRECT_VRAM_READS
PLATCXXFLAGS
=
$(PLATCFLAGS)
#PLATLDFLAGS = -shared -lm
#PLATLDXFLAGS = -shared -lm
...
...
build/Makefile.windows_msvc2010_x64
View file @
0fcbbdc2
##############
# Works on hosts
L
in
ux
#
apt-get install mingw-w64
# Works on hosts
W
in
dows (x64)
#
Download Visual Studio 2010
##########################
# Checks the host platform
...
...
@@ -16,6 +16,10 @@ else ifneq ($(findstring win,$(shell uname -a)),)
HOST_PLATFORM
=
windows
endif
####################################
# Core-specific switches
FRONTEND_SUPPORTS_RGB565
=
1
####################################
# Variable setup for Makefile.common
...
...
@@ -26,6 +30,14 @@ INCLUDES =
include
$(BUILD_DIR)/Makefile.common
#################
# Github version
GIT_VERSION
:=
"
$(
shell
git rev-parse --short HEAD || echo unknown
)
"
ifneq
($(GIT_VERSION)," unknown")
COREDEFINES
+=
-DGIT_VERSION
=
\"
$(GIT_VERSION)
\"
endif
#################
# Toolchain setup
...
...
@@ -59,7 +71,8 @@ SOEXT = .dll
STATIC_LINKING
=
0
PLATDEFS
=
PLATCFLAGS
=
-DWIN32
-DCORRECT_VRAM_READS
-D_WINDOWS
-D_USRDLL
-D_CRT_SECURE_NO_WARNINGS
-DMSVC2010_EXPORTS
-DFRONTEND_SUPPORTS_RGB565
-DGIT_VERSION
=
\"
$(GIT_VERSION)
\"
PLATCFLAGS
=
$(COREDEFINES)
-DWIN32
-D_WINDOWS
-D_USRDLL
-D_CRT_SECURE_NO_WARNINGS
-D_CRT_SECURE_NO_DEPRECATE
-DMSVC2010_EXPORTS
PLATCFLAGS
+=
-DCORRECT_VRAM_READS
PLATCXXFLAGS
=
$(PLATCFLAGS)
#PLATLDFLAGS = -shared -lm
#PLATLDXFLAGS = -shared -lm
...
...
@@ -86,16 +99,16 @@ LDXFLAGS = $(PLATLDXFLAGS) $(RETROLDXFLAGS)
# Tuning
ifeq
($(DEBUG),1)
CFLAGS
+=
-MTd
CXXFLAGS
+=
-MTd
CFLAGS
+=
-Od
-Zi
-D_DEBUG
CXXFLAGS
+=
-Od
-Zi
-D_DEBUG
CFLAGS
+=
-MTd
CXXFLAGS
+=
-MTd
LDFLAGS
+=
-DEBUG
-DLL
else
CFLAGS
+=
-MT
CXXFLAGS
+=
-MT
CFLAGS
+=
-O2
-DNDEBUG
CXXFLAGS
+=
-O2
-DNDEBUG
CFLAGS
+=
-MT
CXXFLAGS
+=
-MT
LDFLAGS
+=
-DLL
endif
...
...
build/Makefile.windows_msvc2010_x86
View file @
0fcbbdc2
##############
# Works on hosts
L
in
ux
#
apt-get install mingw-w64
# Works on hosts
W
in
dows (x64)
#
Download Visual Studio 2010
##########################
# Checks the host platform
...
...
@@ -16,6 +16,10 @@ else ifneq ($(findstring win,$(shell uname -a)),)
HOST_PLATFORM
=
windows
endif
####################################
# Core-specific switches
FRONTEND_SUPPORTS_RGB565
=
1
####################################
# Variable setup for Makefile.common
...
...
@@ -59,7 +63,8 @@ SOEXT = .dll
STATIC_LINKING
=
0
PLATDEFS
=
PLATCFLAGS
=
-DWIN32
-DCORRECT_VRAM_READS
-D_WINDOWS
-D_USRDLL
-D_CRT_SECURE_NO_WARNINGS
-DMSVC2010_EXPORTS
-DFRONTEND_SUPPORTS_RGB565
-DGIT_VERSION
=
\"
$(GIT_VERSION)
\"
PLATCFLAGS
=
$(COREDEFINES)
-DWIN32
-D_WINDOWS
-D_USRDLL
-D_CRT_SECURE_NO_WARNINGS
-D_CRT_SECURE_NO_DEPRECATE
-DMSVC2010_EXPORTS
PLATCFLAGS
+=
-DCORRECT_VRAM_READS
PLATCXXFLAGS
=
$(PLATCFLAGS)
#PLATLDFLAGS = -shared -lm
#PLATLDXFLAGS = -shared -lm
...
...
@@ -86,16 +91,16 @@ LDXFLAGS = $(PLATLDXFLAGS) $(RETROLDXFLAGS)
# Tuning
ifeq
($(DEBUG),1)
CFLAGS
+=
-MTd
CXXFLAGS
+=
-MTd
CFLAGS
+=
-Od
-Zi
-D_DEBUG
CXXFLAGS
+=
-Od
-Zi
-D_DEBUG
CFLAGS
+=
-MTd
CXXFLAGS
+=
-MTd
LDFLAGS
+=
-DEBUG
-DLL
else
CFLAGS
+=
-MT
CXXFLAGS
+=
-MT
CFLAGS
+=
-O2
-DNDEBUG
CXXFLAGS
+=
-O2
-DNDEBUG
CFLAGS
+=
-MT
CXXFLAGS
+=
-MT
LDFLAGS
+=
-DLL
endif
...
...
build/Makefile.windows_msvc2015_x64
View file @
0fcbbdc2
...
...
@@ -63,7 +63,8 @@ SOEXT = .dll
STATIC_LINKING
=
0
platform
=
win
PLATDEFS
=
PLATCFLAGS
=
-DWIN32
-DCORRECT_VRAM_READS
-D_WINDOWS
-D_USRDLL
-D_CRT_SECURE_NO_WARNINGS
-DFRONTEND_SUPPORTS_RGB565
-DGIT_VERSION
=
\"
$(GIT_VERSION)
\"
PLATCFLAGS
=
-DWIN32
-D_WINDOWS
-D_USRDLL
-D_CRT_SECURE_NO_WARNINGS
-DFRONTEND_SUPPORTS_RGB565
-DGIT_VERSION
=
\"
$(GIT_VERSION)
\"
PLATCFLAGS
+=
-DCORRECT_VRAM_READS
PLATCXXFLAGS
=
$(PLATCFLAGS)
#PLATLDFLAGS = -shared -lm
#PLATLDXFLAGS = -shared -lm
...
...
libretro/libretro-common/compat/compat_snprintf.c
0 → 100644
View file @
0fcbbdc2
/* Copyright (C) 2010-2020 The RetroArch team
*
* ---------------------------------------------------------------------------------------
* The following license statement only applies to this file (compat_snprintf.c).
* ---------------------------------------------------------------------------------------
*
* Permission is hereby granted, free of charge,
* to any person obtaining a copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation the rights to
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
* and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
/* THIS FILE HAS NOT BEEN VALIDATED ON PLATFORMS BESIDES MSVC */
#ifdef _MSC_VER
#include <stdio.h>
#include <stdarg.h>
#if _MSC_VER < 1800
#define va_copy(dst, src) ((dst) = (src))
#endif
#if _MSC_VER < 1300
#define _vscprintf c89_vscprintf_retro__
static
int
c89_vscprintf_retro__
(
const
char
*
fmt
,
va_list
pargs
)
{
int
retval
;
va_list
argcopy
;
va_copy
(
argcopy
,
pargs
);
retval
=
vsnprintf
(
NULL
,
0
,
fmt
,
argcopy
);
va_end
(
argcopy
);
return
retval
;
}
#endif
/* http://stackoverflow.com/questions/2915672/snprintf-and-visual-studio-2010 */
int
c99_vsnprintf_retro__
(
char
*
s
,
size_t
len
,
const
char
*
fmt
,
va_list
ap
)
{
int
count
=
-
1
;
if
(
len
!=
0
)
{
#if (_MSC_VER <= 1310)
count
=
_vsnprintf
(
s
,
len
-
1
,
fmt
,
ap
);
#else
count
=
_vsnprintf_s
(
s
,
len
,
len
-
1
,
fmt
,
ap
);
#endif
}
if
(
count
==
-
1
)
count
=
_vscprintf
(
fmt
,
ap
);
/* there was no room for a NULL, so truncate the last character */
if
(
count
==
len
&&
len
)
s
[
len
-
1
]
=
'\0'
;
return
count
;
}
int
c99_snprintf_retro__
(
char
*
s
,
size_t
len
,
const
char
*
fmt
,
...)
{
int
count
;
va_list
ap
;
va_start
(
ap
,
fmt
);
count
=
c99_vsnprintf_retro__
(
s
,
len
,
fmt
,
ap
);
va_end
(
ap
);
return
count
;
}
#endif
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