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-handy
Commits
7c698de4
Commit
7c698de4
authored
Feb 12, 2021
by
Libretro-Admin
Browse files
Add MSVC 2005 / 2010 cores
parent
d14711bc
Pipeline
#14231
passed with stages
in 2 minutes and 38 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
7c698de4
...
...
@@ -21,6 +21,18 @@ include:
-
project
:
'
libretro-infrastructure/ci-templates'
file
:
'
/windows-i686-mingw.yml'
# Windows msvc10 64-bit
-
project
:
'
libretro-infrastructure/ci-templates'
file
:
'
/windows-x64-msvc10-msys2.yml'
# Windows msvc10 32-bit
-
project
:
'
libretro-infrastructure/ci-templates'
file
:
'
/windows-i686-msvc10-msys2.yml'
# Windows msvc05 32-bit
-
project
:
'
libretro-infrastructure/ci-templates'
file
:
'
/windows-i686-msvc05-msys2.yml'
# Linux 64-bit
-
project
:
'
libretro-infrastructure/ci-templates'
file
:
'
/linux-x64.yml'
...
...
@@ -103,6 +115,24 @@ libretro-build-windows-i686:
-
.libretro-windows-i686-mingw-make-default
-
.core-defs
# Windows msvc10 64-bit
libretro-build-windows-msvc10-x64
:
extends
:
-
.libretro-windows-x64-msvc10-msys2-make-default
-
.core-defs
# Windows msvc10 32-bit
libretro-build-windows-msvc10-i686
:
extends
:
-
.libretro-windows-i686-msvc10-msys2-make-default
-
.core-defs
# Windows msvc05 32-bit
libretro-build-windows-msvc05-i686
:
extends
:
-
.libretro-windows-i686-msvc05-msys2-make-default
-
.core-defs
# Linux 64-bit
libretro-build-linux-x64
:
extends
:
...
...
Makefile
View file @
7c698de4
...
...
@@ -348,16 +348,19 @@ PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../IDE")
LIB
:=
$(
shell
IFS
=
$$
'\n'
;
cygpath
"
$(VS100COMNTOOLS)
../../VC/lib/amd64"
)
INCLUDE
:=
$(
shell
IFS
=
$$
'\n'
;
cygpath
"
$(VS100COMNTOOLS)
../../VC/include"
)
WindowsSdkDir
:=
$(
shell
reg query
"HKLM
\S
OFTWARE
\M
icrosoft
\M
icrosoft SDKs
\W
indows
\v
7.
0
A"
-v
"InstallationFolder"
|
grep
-o
'[A-Z]:\\.*'
)
lib/x64
WindowsSdkDir
?=
$(
shell
reg query
"HKLM
\S
OFTWARE
\M
icrosoft
\M
icrosoft SDKs
\W
indows
\v
7.
1
A"
-v
"InstallationFolder"
|
grep
-o
'[A-Z]:\\.*'
)
lib/x64
WindowsSdkDir
:=
$(
shell
reg query
"HKLM
\S
OFTWARE
\M
icrosoft
\M
icrosoft SDKs
\W
indows
\v
7.
1
A"
-v
"InstallationFolder"
|
grep
-o
'[A-Z]:\\.*'
)
WindowsSdkDir
?=
$(
shell
reg query
"HKLM
\S
OFTWARE
\M
icrosoft
\M
icrosoft SDKs
\W
indows
\v
7.
0
A"
-v
"InstallationFolder"
|
grep
-o
'[A-Z]:\\.*'
)
WindowsSdkDirInc
:=
$(
shell
reg query
"HKLM
\S
OFTWARE
\M
icrosoft
\M
icrosoft SDKs
\W
indows
\v
7.0A"
-v
"InstallationFolder"
|
grep
-o
'[A-Z]:\\.*'
)
Include
WindowsSdkDirInc
?=
$(
shell
reg query
"HKLM
\S
OFTWARE
\M
icrosoft
\M
icrosoft SDKs
\W
indows
\v
7.1A"
-v
"InstallationFolder"
|
grep
-o
'[A-Z]:\\.*'
)
Include
WindowsSDKIncludeDir
:=
$(
shell
cygpath
-w
"
$(WindowsSdkDir)
\I
nclude"
)
WindowsSDKGlIncludeDir
:=
$(
shell
cygpath
-w
"
$(WindowsSdkDir)
\I
nclude
\g
l"
)
WindowsSDKLibDir
:=
$(
shell
cygpath
-w
"
$(WindowsSdkDir)
\L
ib
\x
64"
)
INCFLAGS_PLATFORM
=
-I
"
$(WindowsS
dkDirInc
)
"
export
INCLUDE
:=
$(INCLUDE)
export
LIB
:=
$(LIB)
;
$(WindowsS
dk
Dir)
INCFLAGS_PLATFORM
=
-I
"
$(WindowsS
DKIncludeDir
)
"
export
INCLUDE
:=
$(INCLUDE)
;
$(WindowsSDKIncludeDir)
;
$(WindowsSDKGlIncludeDir)
export
LIB
:=
$(LIB)
;
$(WindowsS
DKLib
Dir)
TARGET
:=
$(TARGET_NAME)
_libretro.dll
PSS_STYLE
:=
2
LDFLAGS
+=
-DLL
...
...
@@ -372,16 +375,19 @@ PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../IDE")
LIB
:=
$(
shell
IFS
=
$$
'\n'
;
cygpath
-w
"
$(VS100COMNTOOLS)
../../VC/lib"
)
INCLUDE
:=
$(
shell
IFS
=
$$
'\n'
;
cygpath
"
$(VS100COMNTOOLS)
../../VC/include"
)
WindowsSdkDir
:=
$(
shell
reg query
"HKLM
\S
OFTWARE
\M
icrosoft
\M
icrosoft SDKs
\W
indows
\v
7.
0
A"
-v
"InstallationFolder"
|
grep
-o
'[A-Z]:\\.*'
)
lib
WindowsSdkDir
?=
$(
shell
reg query
"HKLM
\S
OFTWARE
\M
icrosoft
\M
icrosoft SDKs
\W
indows
\v
7.
1
A"
-v
"InstallationFolder"
|
grep
-o
'[A-Z]:\\.*'
)
lib
WindowsSdkDir
:=
$(
shell
reg query
"HKLM
\S
OFTWARE
\M
icrosoft
\M
icrosoft SDKs
\W
indows
\v
7.
1
A"
-v
"InstallationFolder"
|
grep
-o
'[A-Z]:\\.*'
)
WindowsSdkDir
?=
$(
shell
reg query
"HKLM
\S
OFTWARE
\M
icrosoft
\M
icrosoft SDKs
\W
indows
\v
7.
0
A"
-v
"InstallationFolder"
|
grep
-o
'[A-Z]:\\.*'
)
WindowsSdkDirInc
:=
$(
shell
reg query
"HKLM
\S
OFTWARE
\M
icrosoft
\M
icrosoft SDKs
\W
indows
\v
7.0A"
-v
"InstallationFolder"
|
grep
-o
'[A-Z]:\\.*'
)
Include
WindowsSdkDirInc
?=
$(
shell
reg query
"HKLM
\S
OFTWARE
\M
icrosoft
\M
icrosoft SDKs
\W
indows
\v
7.1A"
-v
"InstallationFolder"
|
grep
-o
'[A-Z]:\\.*'
)
Include
WindowsSDKIncludeDir
:=
$(
shell
cygpath
-w
"
$(WindowsSdkDir)
\I
nclude"
)
WindowsSDKGlIncludeDir
:=
$(
shell
cygpath
-w
"
$(WindowsSdkDir)
\I
nclude
\g
l"
)
WindowsSDKLibDir
:=
$(
shell
cygpath
-w
"
$(WindowsSdkDir)
\L
ib"
)
INCFLAGS_PLATFORM
=
-I
"
$(WindowsS
dkDirInc
)
"
export
INCLUDE
:=
$(INCLUDE)
export
LIB
:=
$(LIB)
;
$(WindowsS
dk
Dir)
INCFLAGS_PLATFORM
=
-I
"
$(WindowsS
DKIncludeDir
)
"
export
INCLUDE
:=
$(INCLUDE)
;
$(WindowsSDKIncludeDir)
;
$(WindowsSDKGlIncludeDir)
export
LIB
:=
$(LIB)
;
$(WindowsS
DKLib
Dir)
TARGET
:=
$(TARGET_NAME)
_libretro.dll
PSS_STYLE
:=
2
LDFLAGS
+=
-DLL
...
...
@@ -397,10 +403,17 @@ INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../../VC/include")
LIB
:=
$(
shell
IFS
=
$$
'\n'
;
cygpath
-w
"
$(VS80COMNTOOLS)
../../VC/lib"
)
BIN
:=
$(
shell
IFS
=
$$
'\n'
;
cygpath
"
$(VS80COMNTOOLS)
../../VC/bin"
)
WindowsSdkDir
:=
$(
INETSDK
)
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]:\\.*'
)
export
INCLUDE
:=
$(INCLUDE)
;
$(INETSDK)
/Include
;
libretro-common/include/compat/msvc
export
LIB
:=
$(LIB)
;
$(WindowsSdkDir)
;
$(INETSDK)
/Lib
WindowsSDKIncludeDir
:=
$(
shell
cygpath
-w
"
$(WindowsSdkDir)
\I
nclude"
)
WindowsSDKAtlIncludeDir
:=
$(
shell
cygpath
-w
"
$(WindowsSdkDir)
\I
nclude
\a
tl"
)
WindowsSDKCrtIncludeDir
:=
$(
shell
cygpath
-w
"
$(WindowsSdkDir)
\I
nclude
\c
rt"
)
WindowsSDKGlIncludeDir
:=
$(
shell
cygpath
-w
"
$(WindowsSdkDir)
\I
nclude
\g
l"
)
WindowsSDKMfcIncludeDir
:=
$(
shell
cygpath
-w
"
$(WindowsSdkDir)
\I
nclude
\m
fc"
)
WindowsSDKLibDir
:=
$(
shell
cygpath
-w
"
$(WindowsSdkDir)
\L
ib"
)
export
INCLUDE
:=
$(INCLUDE)
;
$(WindowsSDKIncludeDir)
;
$(WindowsSDKAtlIncludeDir)
;
$(WindowsSDKCrtIncludeDir)
;
$(WindowsSDKGlIncludeDir)
;
$(WindowsSDKMfcIncludeDir)
;
libretro-common/include/compat/msvc
export
LIB
:=
$(LIB)
;
$(WindowsSDKLibDir)
TARGET
:=
$(TARGET_NAME)
_libretro.dll
PSS_STYLE
:=
2
LDFLAGS
+=
-DLL
...
...
@@ -560,6 +573,9 @@ FLAGS += -fomit-frame-pointer
endif
FLAGS
+=
-I
.
$(fpic)
$(libs)
$(includes)
-DWANT_CRC32
ifneq
(,$(findstring msvc,$(platform)))
FLAGS
+=
-D_CRT_SECURE_NO_DEPRECATE
endif
CXXFLAGS
+=
$(FLAGS)
$(INCFLAGS)
$(INCFLAGS_PLATFORM)
CFLAGS
+=
$(FLAGS)
$(INCFLAGS)
$(INCFLAGS_PLATFORM)
...
...
lynx/system.cpp
View file @
7c698de4
...
...
@@ -60,9 +60,9 @@ extern void lynx_decrypt(unsigned char * result, const unsigned char * encrypted
int
lss_read
(
void
*
dest
,
int
varsize
,
int
varcount
,
LSS_FILE
*
fp
)
{
ULONG
copysize
;
copysize
=
varsize
*
varcount
;
if
((
fp
->
index
+
copysize
)
>
fp
->
index_limit
)
copysize
=
fp
->
index_limit
-
fp
->
index
;
ULONG
copysize
=
varsize
*
varcount
;
if
((
fp
->
index
+
copysize
)
>
fp
->
index_limit
)
copysize
=
fp
->
index_limit
-
fp
->
index
;
memcpy
(
dest
,
fp
->
memptr
+
fp
->
index
,
copysize
);
fp
->
index
+=
copysize
;
return
copysize
;
...
...
@@ -70,9 +70,7 @@ int lss_read(void* dest, int varsize, int varcount, LSS_FILE *fp)
int
lss_write
(
void
*
src
,
int
varsize
,
int
varcount
,
LSS_FILE
*
fp
)
{
ULONG
copysize
;
copysize
=
varsize
*
varcount
;
//if((fp->index + copysize) > fp->index_limit) copysize=fp->index_limit - fp->index;
ULONG
copysize
=
varsize
*
varcount
;
memcpy
(
fp
->
memptr
+
fp
->
index
,
src
,
copysize
);
fp
->
index
+=
copysize
;
return
copysize
;
...
...
@@ -80,14 +78,13 @@ int lss_write(void* src, int varsize, int varcount, LSS_FILE *fp)
int
lss_printf
(
LSS_FILE
*
fp
,
const
char
*
str
)
{
ULONG
copysize
;
copysize
=
strlen
(
str
);
ULONG
copysize
=
strlen
(
str
);
memcpy
(
fp
->
memptr
+
fp
->
index
,
str
,
copysize
);
fp
->
index
+=
copysize
;
return
copysize
;
}
void
_
splitpath
(
const
char
*
path
,
char
*
drv
,
char
*
dir
,
char
*
name
,
char
*
ext
)
static
void
split
_
path
(
const
char
*
path
,
char
*
drv
,
char
*
dir
,
char
*
name
,
char
*
ext
)
{
const
char
*
end
;
/* end of processed string */
const
char
*
p
;
/* search pointer */
...
...
@@ -230,7 +227,7 @@ CSystem::CSystem(const char* gamefile, const char* romfile, bool useEmu)
FILE
*
fp
;
char
drive
[
3
],
dir
[
256
],
cartgo
[
256
];
mFileType
=
HANDY_FILETYPE_HOMEBREW
;
_
splitpath
(
romfile
,
drive
,
dir
,
NULL
,
NULL
);
split
_
path
(
romfile
,
drive
,
dir
,
NULL
,
NULL
);
strcpy
(
cartgo
,
drive
);
strcat
(
cartgo
,
dir
);
strcat
(
cartgo
,
"howard.o"
);
...
...
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