hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Added support for building for Win32/Win64 with Qt5

Browse Source
This commit is contained in:
Tobias Doerffel
2014-08-16 17:20:00 +02:00
parent 8ac71f7000
commit 311d290b32
7 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -372,10 +372,10 @@ ENDIF(GIT_FOUND)
SET(lmms_EMBEDDED_RESOURCES "${CMAKE_SOURCE_DIR}/AUTHORS" "${CMAKE_SOURCE_DIR}/COPYING" "${CONTRIBUTORS}")
IF(QT5)
QT5_WRAP_CPP(lmms_MOC_out ${lmms_MOC} OPTIONS -nw)
QT5_WRAP_CPP(lmms_MOC_out ${lmms_MOC} OPTIONS -nw -I${CMAKE_BINARY_DIR})
QT5_WRAP_UI(lmms_UI_out ${lmms_UI})
ELSE()
QT4_WRAP_CPP(lmms_MOC_out ${lmms_MOC} OPTIONS -nw)
QT4_WRAP_CPP(lmms_MOC_out ${lmms_MOC} OPTIONS -nw -I${CMAKE_BINARY_DIR})
QT4_WRAP_UI(lmms_UI_out ${lmms_UI})
ENDIF()

9
build_mingw32
View File

@@ -1,7 +1,14 @@
#!/bin/sh
MINGW=/opt/mingw32
export PATH=$PATH:$MINGW/bin
#export CFLAGS="-march=pentium3 -mtune=generic -mpreferred-stack-boundary=5 -fno-tree-vectorize"
export CFLAGS="-march=pentium3 -mtune=generic -mpreferred-stack-boundary=5"
export CXXFLAGS="$CFLAGS"
cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/modules/Win32Toolchain.cmake -DCMAKE_MODULE_PATH=`pwd`/../cmake/modules/
if [ "$1" = "-qt5" ] ; then
CMAKE_OPTS="-DWANT_QT5=ON -DCMAKE_PREFIX_PATH=$MINGW"
fi
cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/modules/Win32Toolchain.cmake -DCMAKE_MODULE_PATH=`pwd`/../cmake/modules/ $CMAKE_OPTS

9
build_mingw64
View File

@@ -1,6 +1,13 @@
#!/bin/sh
MINGW=/opt/mingw64
export PATH=$PATH:$MINGW/bin
#export CFLAGS="-fno-tree-vectorize"
export CXXFLAGS="$CFLAGS"
cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/modules/Win64Toolchain.cmake -DCMAKE_MODULE_PATH=`pwd`/../cmake/modules/
if [ "$1" = "-qt5" ] ; then
CMAKE_OPTS="-DWANT_QT5=ON -DCMAKE_PREFIX_PATH=$MINGW"
fi
cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/modules/Win64Toolchain.cmake -DCMAKE_MODULE_PATH=`pwd`/../cmake/modules/ $CMAKE_OPTS

5
include/AudioJack.h
View File

@@ -29,7 +29,6 @@
#ifdef LMMS_HAVE_JACK
#include <jack/jack.h>
#endif
#include <QtCore/QVector>
#include <QtCore/QList>
@@ -75,7 +74,6 @@ private slots:
void restartAfterZombified();
#ifdef LMMS_HAVE_JACK
private:
bool initJackClient();
@@ -118,7 +116,6 @@ private:
typedef QMap<AudioPort *, StereoPort> JackPortMap;
JackPortMap m_portMap;
#endif
#endif
signals:
void zombified();
@@ -126,3 +123,5 @@ signals:
} ;
#endif
#endif

3
include/MidiAlsaSeq.h
View File

@@ -29,7 +29,6 @@
#ifdef LMMS_HAVE_ALSA
#include <alsa/asoundlib.h>
#endif
#include <QtCore/QMutex>
#include <QtCore/QThread>
@@ -161,3 +160,5 @@ signals:
#endif
#endif

4
include/MidiWinMM.h
View File

@@ -63,7 +63,6 @@ public:
virtual void removePort( MidiPort * _port );
#ifdef LMMS_BUILD_WIN32
// list devices as ports
virtual QStringList readablePorts() const
{
@@ -74,7 +73,6 @@ public:
{
return m_outputDevices.values();
}
#endif
// return name of port which specified MIDI event came from
virtual QString sourcePortName( const MidiEvent & ) const;
@@ -127,7 +125,6 @@ private:
void openDevices();
void closeDevices();
#ifdef LMMS_BUILD_WIN32
static void WINAPI CALLBACK inputCallback( HMIDIIN _hm, UINT _msg,
DWORD_PTR _inst,
DWORD_PTR _param1,
@@ -136,7 +133,6 @@ private:
QMap<HMIDIIN, QString> m_inputDevices;
QMap<HMIDIOUT, QString> m_outputDevices;
#endif
// subscriptions
typedef QMap<QString, MidiPortList> SubMap;

7
plugins/vst_base/CMakeLists.txt
View File

@@ -5,7 +5,12 @@ INCLUDE(BuildPlugin)
IF(LMMS_BUILD_WIN32)
ADD_DEFINITIONS(-DPTW32_STATIC_LIB)
ADD_EXECUTABLE(RemoteVstPlugin "${CMAKE_CURRENT_SOURCE_DIR}/RemoteVstPlugin.cpp")
TARGET_LINK_LIBRARIES(RemoteVstPlugin -lQtCore4 -lpthread -lgdi32 -lws2_32)
IF(QT5)
TARGET_LINK_LIBRARIES(RemoteVstPlugin Qt5::Core)
ELSE()
TARGET_LINK_LIBRARIES(RemoteVstPlugin -lQtCore4)
ENDIF()
TARGET_LINK_LIBRARIES(RemoteVstPlugin -lpthread -lgdi32 -lws2_32)
SET_TARGET_PROPERTIES(RemoteVstPlugin PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -O3")
ADD_CUSTOM_COMMAND(TARGET RemoteVstPlugin POST_BUILD COMMAND "${STRIP}" "${CMAKE_CURRENT_BINARY_DIR}/RemoteVstPlugin.exe")
INSTALL(TARGETS RemoteVstPlugin RUNTIME DESTINATION "${PLUGIN_DIR}")