Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

audio redesign #2407

Closed
wants to merge 13 commits into from
Closed
Show file tree
Hide file tree
Changes from 9 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Makefile
*.pro.user*
**.cppe
**.he
.vs
.cproject
.project
.settings
Expand Down
20 changes: 10 additions & 10 deletions Jamulus.pro
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION = 3.8.2rc1dev
VERSION = 3.8.2beta1dev

# use target name which does not use a capital letter at the beginning
contains(CONFIG, "noupcasename") {
Expand Down Expand Up @@ -66,17 +66,17 @@ DEFINES += APP_VERSION=\\\"$$VERSION\\\" \
DEFINES += QT_NO_DEPRECATED_WARNINGS

win32 {
DEFINES -= UNICODE # fixes issue with ASIO SDK (asiolist.cpp is not unicode compatible)
DEFINES -= UNICODE # fixes issue with ASIO SDK (asiolist.cpp is not unicode compatible) pgScorpio: is this still valid ??? asiolist.cpp no longer exists!
DEFINES += NOMINMAX # solves a compiler error in qdatetime.h (Qt5)
HEADERS += windows/sound.h
SOURCES += windows/sound.cpp \
windows/ASIOSDK2/common/asio.cpp \
windows/ASIOSDK2/host/asiodrivers.cpp \
windows/ASIOSDK2/host/pc/asiolist.cpp
HEADERS += windows/asio.h \
windows/asiodrivers.h \
windows/asiosys.h \
windows/iasiodrv.h \
windows/sound.h
SOURCES += windows/asio.cpp \
windows/asiodrivers.cpp \
windows/sound.cpp
RC_FILE = windows/mainicon.rc
INCLUDEPATH += windows/ASIOSDK2/common \
windows/ASIOSDK2/host \
windows/ASIOSDK2/host/pc
mingw* {
LIBS += -lole32 \
-luser32 \
Expand Down
25 changes: 25 additions & 0 deletions JamulusWin-README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
JamulusWin.* files for builing the windows version using visual studio 2019 (by pgScorpio)

#==================================================================================================
# WARNING:
# The vcx project files in this folder are heavily modified to make them movable.
# DO NOT REGENERATE VCX FILES FROM Qt!
# When the Jamulus pro file is changed, the vcx files need (often manual) editing too!
#
# In Visual Studio NEVER use ABSOLUTE PATHS but always use the appropriate variables.
# In Visual Studio NEVER use PERSONAL PATHS but always use appropriate environment variables.
#
# Do NOT directly open the JamulusWin.vcxproj or JamulusWin.sln files by double-clicking !
# ALWAYS start Visual studio using this script from Powershell using./JamulusWin.ps1 --startvs
#==================================================================================================


JamulusWin.ps1 is a PowerShell script to setup the environment needed for builing with Visual Studio.
JamulusWin.ps1 also handles all Custom Build Steps during building of the project. (Modify when needed.)

Run ./JamulusWin.ps1 without parameters for command options info.

You should check the variables defined in JamulusWin.ps1 to reflect your Qt installation

You can modify the 'User Defined functions' in JamulusWin.ps1 if needed.

Comment on lines +1 to +25
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should go into COMPILING.md if we merge the vs files.

Loading