mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

UnitTestRunner: Fixed some build warnings on Linux

Browse source
This commit is contained in:
tpoole 2017-07-06 17:17:52 +01:00
parent 50dce5079d
commit 73d4e73a3d
6 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
extras/UnitTestRunner/Builds/LinuxMakefile/Makefile
View file

@ -37,7 +37,7 @@ ifeq ($(CONFIG),Debug)
JUCE_CPPFLAGS_CONSOLEAPP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0
JUCE_TARGET_CONSOLEAPP := UnitTestRunner
JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS)
JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -Wall -Werror $(CFLAGS)
JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS)
JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -lGL -ldl -lpthread -lrt $(LDFLAGS)
@ -58,7 +58,7 @@ ifeq ($(CONFIG),Release)
JUCE_CPPFLAGS_CONSOLEAPP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0
JUCE_TARGET_CONSOLEAPP := UnitTestRunner
JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS)
JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 -Wall -Werror $(CFLAGS)
JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS)
JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -lGL -ldl -lpthread -lrt $(LDFLAGS)

12
extras/UnitTestRunner/UnitTestRunner.jucer
View file

@ -27,7 +27,6 @@
<MODULEPATH id="juce_gui_basics" path="../../modules"/>
<MODULEPATH id="juce_gui_extra" path="../../modules"/>
<MODULEPATH id="juce_cryptography" path="../../modules"/>
<MODULEPATH id="juce_video" path="../../modules"/>
<MODULEPATH id="juce_opengl" path="../../modules"/>
<MODULEPATH id="juce_audio_basics" path="../../modules"/>
<MODULEPATH id="juce_audio_devices" path="../../modules"/>
@ -37,9 +36,10 @@
<MODULEPATH id="juce_audio_utils" path="../../modules"/>
<MODULEPATH id="juce_blocks_basics" path="../../modules"/>
<MODULEPATH id="juce_product_unlocking" path="../../modules"/>
<MODULEPATH id="juce_video" path="../../modules"/>
</MODULEPATHS>
</XCODE_MAC>
<LINUX_MAKE targetFolder="Builds/LinuxMakefile">
<LINUX_MAKE targetFolder="Builds/LinuxMakefile" extraCompilerFlags="-Wall -Werror">
<CONFIGURATIONS>
<CONFIGURATION name="Debug" libraryPath="/usr/X11R6/lib/" isDebug="1" optimisation="1"
targetName="UnitTestRunner"/>
@ -54,7 +54,6 @@
<MODULEPATH id="juce_gui_basics" path="../../modules"/>
<MODULEPATH id="juce_gui_extra" path="../../modules"/>
<MODULEPATH id="juce_cryptography" path="../../modules"/>
<MODULEPATH id="juce_video" path="../../modules"/>
<MODULEPATH id="juce_opengl" path="../../modules"/>
<MODULEPATH id="juce_audio_basics" path="../../modules"/>
<MODULEPATH id="juce_audio_devices" path="../../modules"/>
@ -64,6 +63,7 @@
<MODULEPATH id="juce_audio_utils" path="../../modules"/>
<MODULEPATH id="juce_blocks_basics" path="../../modules"/>
<MODULEPATH id="juce_product_unlocking" path="../../modules"/>
<MODULEPATH id="juce_video" path="../../modules"/>
</MODULEPATHS>
</LINUX_MAKE>
<VS2015 targetFolder="Builds/VisualStudio2015">
@ -76,7 +76,6 @@
warningsAreErrors="1"/>
</CONFIGURATIONS>
<MODULEPATHS>
<MODULEPATH id="juce_video" path="../../modules"/>
<MODULEPATH id="juce_osc" path="../../modules"/>
<MODULEPATH id="juce_opengl" path="../../modules"/>
<MODULEPATH id="juce_gui_extra" path="../../modules"/>
@ -93,6 +92,7 @@
<MODULEPATH id="juce_audio_utils" path="../../modules"/>
<MODULEPATH id="juce_blocks_basics" path="../../modules"/>
<MODULEPATH id="juce_product_unlocking" path="../../modules"/>
<MODULEPATH id="juce_video" path="../../modules"/>
</MODULEPATHS>
</VS2015>
<VS2017 targetFolder="Builds/VisualStudio2017">
@ -105,7 +105,6 @@
wholeProgramOptimisation="1"/>
</CONFIGURATIONS>
<MODULEPATHS>
<MODULEPATH id="juce_video" path="../../modules"/>
<MODULEPATH id="juce_osc" path="../../modules"/>
<MODULEPATH id="juce_opengl" path="../../modules"/>
<MODULEPATH id="juce_gui_extra" path="../../modules"/>
@ -122,6 +121,7 @@
<MODULEPATH id="juce_audio_utils" path="../../modules"/>
<MODULEPATH id="juce_blocks_basics" path="../../modules"/>
<MODULEPATH id="juce_product_unlocking" path="../../modules"/>
<MODULEPATH id="juce_video" path="../../modules"/>
</MODULEPATHS>
</VS2017>
</EXPORTFORMATS>
@ -143,7 +143,7 @@
<MODULES id="juce_osc" showAllCode="1" useLocalCopy="0"/>
<MODULE id="juce_product_unlocking" showAllCode="1" useLocalCopy="0"
useGlobalPath="0"/>
<MODULES id="juce_video" showAllCode="1" useLocalCopy="0"/>
<MODULE id="juce_video" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/>
</MODULES>
<JUCEOPTIONS/>
<LIVE_SETTINGS>

2
modules/juce_gui_basics/misc/juce_JUCESplashScreen.cpp
View file

@ -227,6 +227,8 @@ JUCESplashScreen::JUCESplashScreen (Component& parent)
appUsageReported = true;
}
}
#else
ignoreUnused (appUsageReported);
#endif
#if JUCE_DISPLAY_SPLASH_SCREEN

4
modules/juce_gui_basics/native/juce_linux_X11_Windowing.cpp
View file

@ -2216,7 +2216,7 @@ public:
auto mapIndex = (uint32) (buttonPressEvent.button - Button1);
if (mapIndex < numElementsInArray (pointerMap))
if (mapIndex < (uint32) numElementsInArray (pointerMap))
{
switch (pointerMap[mapIndex])
{
@ -2241,7 +2241,7 @@ public:
auto mapIndex = (uint32) (buttonRelEvent.button - Button1);
if (mapIndex < numElementsInArray (pointerMap))
if (mapIndex < (uint32) numElementsInArray (pointerMap))
{
switch (pointerMap[mapIndex])
{

1
modules/juce_opengl/juce_opengl.cpp
View file

@ -191,6 +191,7 @@ static bool checkPeerIsValid (OpenGLContext* context)
}
}
#else
ignoreUnused (peer);
return true;
#endif
}

2
modules/juce_opengl/native/juce_OpenGL_linux_X11.h
View file

@ -241,7 +241,7 @@ bool OpenGLHelpers::isContextActive()
{
ScopedXDisplay xDisplay;
if (auto display = xDisplay.display)
if (xDisplay.display)
{
ScopedXLock xlock (xDisplay.display);
return glXGetCurrentContext() != 0;