Move innosetup meson config into scripts directory

The purpose is to keep the main meson build file as simple as possible
while keeping the innosetup config.
This commit is contained in:
Francesco Abbate 2021-09-04 18:15:07 +02:00
parent cc20849afd
commit 91da2ddfdd
3 changed files with 10 additions and 8 deletions

View File

@ -14,13 +14,6 @@ conf_data.set('PROJECT_BUILD_DIR', meson.current_build_dir())
conf_data.set('PROJECT_SOURCE_DIR', meson.current_source_dir())
conf_data.set('PROJECT_VERSION', meson.project_version())
if host_machine.system() == 'windows'
configure_file(
input : 'scripts/innosetup/innosetup.iss.in',
output : 'innosetup.iss',
configuration : conf_data
)
endif
#===============================================================================
# Compiler Settings
#===============================================================================
@ -127,3 +120,4 @@ configure_file(
#===============================================================================
subdir('lib/font_renderer')
subdir('src')
subdir('scripts')

View File

@ -51,5 +51,5 @@ else
ARCH=Win32
fi
/c/Program\ Files\ \(x86\)/Inno\ Setup\ 6/ISCC.exe -dARCH=$ARCH $BUILD_DIR/innosetup.iss
/c/Program\ Files\ \(x86\)/Inno\ Setup\ 6/ISCC.exe -dARCH=$ARCH $BUILD_DIR/scripts/innosetup.iss
mv $BUILD_DIR/LiteXL*.exe $(pwd)

8
scripts/meson.build Normal file
View File

@ -0,0 +1,8 @@
if host_machine.system() == 'windows'
configure_file(
input : 'innosetup/innosetup.iss.in',
output : 'innosetup.iss',
configuration : conf_data
)
endif