Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions 3rdparty/3rdparty.pri
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,26 @@ HEADERS += $$SIMDJSONDIR/simdjson.h
SOURCES += $$SIMDJSONDIR/simdjson.cpp


win32* {
ZLIBDIR = $$PWD/zlib-msvc14-x64.1.2.11.7795/build/native
INCLUDEPATH += $$ZLIBDIR/include
win32-g++ {
!defined(WINDOWS_MINGW_BUILD_ROOT, var) {
error("WINDOWS_MINGW_BUILD_ROOT must point to the directory containing the MinGW dependency builds")
}
!defined(MINGW_ROOT, var) {
error("MINGW_ROOT must point to the MinGW toolchain root")
}

INCLUDEPATH += $$MINGW_ROOT/x86_64-w64-mingw32/include
INCLUDEPATH += $$WINDOWS_MINGW_BUILD_ROOT/snappy-release
LIBS += $$MINGW_ROOT/x86_64-w64-mingw32/lib/libz.a
LIBS += $$WINDOWS_MINGW_BUILD_ROOT/lz4-release/liblz4.a
LIBS += $$WINDOWS_MINGW_BUILD_ROOT/zstd-release/lib/libzstd.a
LIBS += $$WINDOWS_MINGW_BUILD_ROOT/snappy-release/libsnappy.a
LIBS += $$WINDOWS_MINGW_BUILD_ROOT/brotli-release/libbrotlidec-static.a
LIBS += $$WINDOWS_MINGW_BUILD_ROOT/brotli-release/libbrotlienc-static.a
LIBS += $$WINDOWS_MINGW_BUILD_ROOT/brotli-release/libbrotlicommon-static.a
} else:win32* {
ZLIBDIR = $$PWD/zlib-msvc14-x64.1.2.11.7795/build/native
INCLUDEPATH += $$ZLIBDIR/include
LIBS += $$ZLIBDIR/lib_release/zlibstatic.lib $$LZ4DIR/build/cmake/Release/lz4.lib
LIBS += $$ZSTDDIR/build/cmake/lib/Release/zstd_static.lib
LIBS += $$SNAPPYDIR/Release/snappy.lib
Expand Down
14 changes: 11 additions & 3 deletions 3rdparty/pyotherside.pri
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,13 @@ PY_WIN_VERSION="38"
PY_LIB_SUFFIX="3.9"

win32* {
QMAKE_LIBS += -LC:\Python$${PY_WIN_VERSION}-x64\libs -lpython$${PY_WIN_VERSION}
INCLUDEPATH += C:\Python$${PY_WIN_VERSION}-x64\include\
defined(PYTHON_ROOT, var) {
QMAKE_LIBS += -L$$PYTHON_ROOT/libs -lpython$${PY_WIN_VERSION}
INCLUDEPATH += $$PYTHON_ROOT/include
} else {
QMAKE_LIBS += -LC:\Python$${PY_WIN_VERSION}-x64\libs -lpython$${PY_WIN_VERSION}
INCLUDEPATH += C:\Python$${PY_WIN_VERSION}-x64\include\
}
} else {
unix:macx {
exists($$PWD/python-3) {
Expand Down Expand Up @@ -41,9 +46,12 @@ win32* {
}
}

RESP_APP_VERSION = $$VERSION
include(pyotherside/pyotherside.pri)
PYOTHERSIDE_EMBEDDED_VERSION = $$VERSION
VERSION = $$RESP_APP_VERSION

DEFINES += PYOTHERSIDE_VERSION=\\\"$${VERSION}\\\"
DEFINES += PYOTHERSIDE_VERSION=\\\"$$PYOTHERSIDE_EMBEDDED_VERSION\\\"

DEPENDPATH += $$PWD/pyotherside/src
INCLUDEPATH += $$PWD/pyotherside/src
Expand Down
27 changes: 18 additions & 9 deletions build/windows/installer/installer.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,14 @@ SetCompress auto
SetCompressor /SOLID /FINAL lzma
ManifestDPIAware true

# General Symbol Definitions
!define REGKEY "SOFTWARE\$(Name)"
!define COMPANY "Igor Malinovskiy"
!define URL resp.app
!define APP_EXE "resp.exe"
# General Symbol Definitions
!define REGKEY "SOFTWARE\RESP.app"
!define COMPANY "Igor Malinovskiy"
!define URL resp.app
!define APP_EXE "resp.exe"
!ifndef SOURCE_DIR
!define SOURCE_DIR "resources"
!endif

# MUI Symbol Definitions
!define MUI_ICON "..\..\..\src\resources\images\logo.ico"
Expand Down Expand Up @@ -48,7 +51,11 @@ Var StartMenuGroup
!insertmacro MUI_LANGUAGE English

# Installer attributes
OutFile resp-${VERSION}.exe
!ifdef OUTPUT_FILE
OutFile "${OUTPUT_FILE}"
!else
OutFile resp-${VERSION}.exe
!endif
InstallDir $PROGRAMFILES64\RESP_app
CRCCheck on
XPStyle on
Expand Down Expand Up @@ -84,9 +91,11 @@ Section -Main SEC0000

not_installed:
SetOutPath $INSTDIR
File /r resources\*
WriteRegStr HKLM "${REGKEY}\Components" Main 1
!insertmacro InstallVCredist
File /r "${SOURCE_DIR}\*"
WriteRegStr HKLM "${REGKEY}\Components" Main 1
!ifndef SKIP_VCREDIST
!insertmacro InstallVCredist
!endif
BringToFront
SectionEnd

Expand Down
4 changes: 3 additions & 1 deletion build/windows/installer/resources/qt.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[Paths]
Prefix=..
Prefix=.
Plugins=plugins
Qml2Imports=qml