diff --git a/data/windows/create-wineprefixes.sh b/data/windows/create-wineprefixes.sh index 65e947e52..4ab3bb4d5 100755 --- a/data/windows/create-wineprefixes.sh +++ b/data/windows/create-wineprefixes.sh @@ -15,7 +15,7 @@ winetricks fontsmooth=rgb # cd data/windows/python # msiexec /i python-3.4.3.msi /qn # wine cx_Freeze-4.3.4.win32-py3.4.exe -# wine PyQt5-5.4.1-gpl-Py3.4-Qt5.4.1-x32.exe +# wine PyQt5-5.5-gpl-Py3.4-Qt5.5.0-x32.exe # cd ../../.. export WINEARCH=win64 @@ -30,5 +30,5 @@ winetricks fontsmooth=rgb # cd data/windows/python # msiexec /i python-3.4.3.amd64.msi /qn # wine cx_Freeze-4.3.4.win-amd64-py3.4.exe -# wine PyQt5-5.4.1-gpl-Py3.4-Qt5.4.1-x64.exe +# wine PyQt5-5.5-gpl-Py3.4-Qt5.5.0-x64.exe # cd ../../.. diff --git a/source/Makefile.mk b/source/Makefile.mk index f6b60d701..3ec02a66a 100644 --- a/source/Makefile.mk +++ b/source/Makefile.mk @@ -103,7 +103,9 @@ ifeq ($(NOOPT),true) BASE_OPTS = -O2 -ffast-math -fdata-sections -ffunction-sections endif -ifneq ($(WIN32),true) +ifeq ($(WIN32),true) +BASE_FLAGS += -D__MSVCRT_VERSION__=0x900 +else # not needed for Windows BASE_FLAGS += -fPIC -DPIC endif @@ -403,14 +405,14 @@ LILV_LIBS = -ldl -lm endif ifeq ($(WIN32),true) -DGL_LIBS = -lopengl32 -lgdi32 -JACKBRIDGE_LIBS = -lpthread -JUCE_AUDIO_DEVICES_LIBS = -lwinmm -lole32 -JUCE_CORE_LIBS = -luuid -lwsock32 -lwininet -lversion -lole32 -lws2_32 -loleaut32 -limm32 -lcomdlg32 -lshlwapi -lrpcrt4 -lwinmm -# JUCE_EVENTS_LIBS = -lole32 -JUCE_GRAPHICS_LIBS = -lgdi32 -JUCE_GUI_BASICS_LIBS = -lgdi32 -limm32 -lcomdlg32 -lole32 -LILV_LIBS = -lm +DGL_LIBS = -lopengl32 -lgdi32 +JACKBRIDGE_LIBS = -lpthread +JUCE_AUDIO_DEVICES_LIBS = -lwinmm -lole32 +JUCE_AUDIO_PROCESSORS_LIBS = -lmsvcr90 +JUCE_CORE_LIBS = -luuid -lwsock32 -lwininet -lversion -lole32 -lws2_32 -loleaut32 -limm32 -lcomdlg32 -lshlwapi -lrpcrt4 -lwinmm +JUCE_GRAPHICS_LIBS = -lgdi32 +JUCE_GUI_BASICS_LIBS = -lgdi32 -limm32 -lcomdlg32 -lole32 +LILV_LIBS = -lm endif # --------------------------------------------------------------