funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2026-03-19 10:22:42 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed Windows compile issues.

Browse Source
This commit is contained in:
Pieter Hulshoff
2017-01-06 13:06:28 +01:00
parent 2b2b6bc7ce
commit b7cd765506
570 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
Scripts/Package.py
View File

@@ -42,16 +42,16 @@ args = parser.parse_args()
gstreamer_path = None
# windows needs a gstreamer path set
if args.os == 'windows':
if not hasattr(args, 'gstreamer_path'):
print('missing argument --gstreamer_path')
sys.exit(-1)
gstreamer_path = args.gstreamer_path
if not os.path.exists(gstreamer_path):
print('could not find gstreamer libraries: ' + gstreamer_path)
sys.exit(-1)
#if args.os == 'windows':
# if not hasattr(args, 'gstreamer_path'):
# print('missing argument --gstreamer_path')
# sys.exit(-1)
#
# gstreamer_path = args.gstreamer_path
#
# if not os.path.exists(gstreamer_path):
# print('could not find gstreamer libraries: ' + gstreamer_path)
# sys.exit(-1)
#####################################################################
@@ -138,23 +138,23 @@ if args.os == 'windows':
# copy retrofe.exe
shutil.copy(src_exe, core_path)
third_party_path = os.path.join(base_path, 'RetroFE', 'ThirdParty')
# third_party_path = os.path.join(base_path, 'RetroFE', 'ThirdParty')
if args.build == 'full' or args.build == 'core':
libraries = [
os.path.join(gstreamer_path, 'lib/*.dll'),
os.path.join(gstreamer_path, 'lib/gstreamer-1.0/*.dll'),
os.path.join(gstreamer_path, 'bin/*.dll'),
os.path.join(third_party_path, 'SDL2-2.0.3', 'lib', 'x86', r'*.dll'),
os.path.join(third_party_path, 'SDL2_image-2.0.0', 'lib', 'x86', '*.dll'),
os.path.join(third_party_path, 'SDL2_mixer-2.0.0', 'lib', 'x86', '*.dll'),
os.path.join(third_party_path, 'SDL2_ttf-2.0.12', 'lib', 'x86', '*.dll')
]
# copy third party libraries
for glob_dlls in libraries:
for file in glob.glob(glob_dlls):
shutil.copy(file, core_path)
# if args.build == 'full' or args.build == 'core':
# libraries = [
# os.path.join(gstreamer_path, 'lib/*.dll'),
# os.path.join(gstreamer_path, 'lib/gstreamer-1.0/*.dll'),
# os.path.join(gstreamer_path, 'bin/*.dll'),
# os.path.join(third_party_path, 'SDL2-2.0.3', 'lib', 'x86', r'*.dll'),
# os.path.join(third_party_path, 'SDL2_image-2.0.0', 'lib', 'x86', '*.dll'),
# os.path.join(third_party_path, 'SDL2_mixer-2.0.0', 'lib', 'x86', '*.dll'),
# os.path.join(third_party_path, 'SDL2_ttf-2.0.12', 'lib', 'x86', '*.dll')
# ]
#
# # copy third party libraries
# for glob_dlls in libraries:
# for file in glob.glob(glob_dlls):
# shutil.copy(file, core_path)
elif args.os == 'linux':