ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GTK+: Fix minizip includes. Add default options.

This commit is contained in:
Brandon Wright 2018-12-18 12:15:26 -06:00
parent 9b04ba3a28
commit 0b787becc1
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gtk/meson.build
View File

@ -1,4 +1,9 @@
project('snes9x-gtk', ['c', 'cpp'], version: '1.58', default_options: ['cpp_std=c++11']) project('snes9x-gtk',
['c', 'cpp'],
version: '1.58',
default_options: ['cpp_std=c++11',
'buildtype=release',
'strip=true'])
subdir('po') subdir('po')
subdir('data') subdir('data')
@ -6,7 +11,7 @@ subdir('data')
args = [ '-DSNES9X_GTK', '-DUNZIP_SUPPORT', '-DNETPLAY_SUPPORT', '-DJMA_SUPPORT', '-Wall', '-W', '-Wno-unused-parameter' ] args = [ '-DSNES9X_GTK', '-DUNZIP_SUPPORT', '-DNETPLAY_SUPPORT', '-DJMA_SUPPORT', '-Wall', '-W', '-Wno-unused-parameter' ]
srcs = [] srcs = []
deps = [] deps = []
includes = include_directories('../apu/bapu', '../', 'src') includes = [ '../apu/bapu', '../', 'src' ]
prefix = get_option('prefix') prefix = get_option('prefix')
localedir = join_paths(prefix, get_option('localedir')) localedir = join_paths(prefix, get_option('localedir'))
@ -144,16 +149,15 @@ if get_option('screenshot')
endif endif
endif endif
if get_option('system-zip') systemzip_dep = dependency('minizip', required: false)
systemzip_dep = dependency('minizip', required: false)
if systemzip_dep.found() if get_option('system-zip') and systemzip_dep.found()
args += '-DSYSTEM_ZIP' args += '-DSYSTEM_ZIP'
deps += systemzip_dep deps += systemzip_dep
else else
message('minizip not found. Using built-in minizip.') message('Using built-in minizip.')
srcs += [ '../unzip/unzip.c', '../unzip/ioapi.c', '../unzip/zip.c' ] includes += '../unzip'
endif srcs += [ '../unzip/unzip.c', '../unzip/ioapi.c', '../unzip/zip.c' ]
endif endif
if get_option('zlib') if get_option('zlib')
@ -325,7 +329,7 @@ libjma = static_library('jma',
libjma_srcs, libjma_srcs,
c_args: args, c_args: args,
cpp_args: [args, '-fexceptions'], cpp_args: [args, '-fexceptions'],
include_directories: includes) include_directories: include_directories(includes))
sourcify = executable('sourcify', 'src/sourcify.c') sourcify = executable('sourcify', 'src/sourcify.c')
gtk_snes9x_ui_cpp = custom_target('sourcify', gtk_snes9x_ui_cpp = custom_target('sourcify',
@ -339,7 +343,7 @@ snes9x_gtk = executable('snes9x-gtk',
c_args: args, c_args: args,
cpp_args: [args, '-fno-exceptions', '-fno-rtti'], cpp_args: [args, '-fno-exceptions', '-fno-rtti'],
dependencies: deps, dependencies: deps,
include_directories: includes, include_directories: include_directories(includes),
link_with: libjma, link_with: libjma,
install: true) install: true)