build: adding NDEBUG to #defines

oyvv · May 18, 2020 · a0342da · a0342da
1 parent 471b6e8
commit a0342da
Show file tree

Hide file tree

Showing 43 changed files with 54 additions and 16 deletions.
diff --git a/external/sapserver b/external/sapserver
diff --git a/manifest_creator/manifest_creator.cbp b/manifest_creator/manifest_creator.cbp
@@ -70,11 +70,12 @@
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Compiler>
+					<Add option="-O3" />
 					<Add option="`wx-config --cxxflags`" />
 					<Add option="-fpermissive" />
-					<Add option="-O3" />
 					<Add option="-DwxUSE_UNICODE" />
 					<Add option="-D__WXGNU__" />
+					<Add option="-DNDEBUG" />
 				</Compiler>
 				<Linker>
 					<Add option="`wx-config --libs`" />

diff --git a/pam2.workspace b/pam2.workspace
@@ -5,6 +5,7 @@
 		<Project filename="external/dnssd/dnssd.cbp" />
 		<Project filename="external/sapserver/sapserver.cbp" />
 		<Project filename="manifest_creator/manifest_creator.cbp" />
+		<Project filename="external/ptpmonkey/ptpmonkey.cbp" />
 		<Project filename="pambase/pambase.cbp" />
 		<Project filename="pamfft/pamfft.cbp" />
 		<Project filename="pamlevel/pamlevel.cbp" />

diff --git a/pam2/pam2.cbp b/pam2/pam2.cbp
@@ -114,6 +114,7 @@
 					<Add option="-DwxUSE_UNICODE" />
 					<Add option="-D__WXGNU__" />
 					<Add option="-DwxDEBUG_LEVEL=0" />
+					<Add option="-DNDEBUG" />
 					<Add directory="$(#nmos.include)" />
 					<Add directory="$(#json.include)" />
 				</Compiler>

diff --git a/pam2/pam2App.cpp b/pam2/pam2App.cpp
@@ -26,7 +26,7 @@ IMPLEMENT_APP(pam2App);
 bool pam2App::OnInit()
 {
     m_bReset = false;
-    #ifndef __WXDEBUG__
+    #ifdef NDEGBU
     wxLog::SetLogLevel(0);
     #endif
     #ifdef __WXGNU__

diff --git a/pam2/pnlUpdate.cpp b/pam2/pnlUpdate.cpp
@@ -318,7 +318,7 @@ void pnlUpdate::OnbtnSelectClick(wxCommandEvent& event)
 
 void pnlUpdate::OnbtnCheckClick(wxCommandEvent& event)
 {
-     #ifdef __WXDEBUG__
+     #ifndef NDEBUG
         #ifdef __WXMSW__
             wxString sUpdate = wxT("C:\\developer\\matt\\pam2\\pamupdatemanager\\bin\\Debug\\pamupdatemanager");
         #else

diff --git a/pam2/wxlogoutput.cpp b/pam2/wxlogoutput.cpp
@@ -17,8 +17,7 @@ void wxLogOutput::Flush(int nLogLevel, const std::stringstream&  logStream)
         wxQueueEvent(m_pHandler, pEvent);
     }
 
-    #ifdef __WXDEBUG__
-
+    #ifndef NDEBUG
         std::cout << "LOGOUTPUT:     " << logStream.str() << std::endl;
     #endif // __WXDEBUG__
 

diff --git a/pambase/aes67mediasession.cpp b/pambase/aes67mediasession.cpp
@@ -113,7 +113,9 @@ Boolean Aes67MediaSession::parseSDPAttribute_RefClk(char const* sdpLine)
                 }
             }
         }
+        return True;
     }
+    return False;
 }
 
 

diff --git a/pambase/dlldefine.h b/pambase/dlldefine.h
@@ -1,6 +1,6 @@
 #pragma once
 #define WINVER 0x0600
-#include <wx/string.h>
+
 
 #ifdef __WXMSW__
 #ifdef CREATING_DLL

diff --git a/pambase/pambase.cbp b/pambase/pambase.cbp
@@ -116,8 +116,8 @@
 					<Add option="-DwxUSE_UNICODE" />
 					<Add option="-D__WXGNU__" />
 					<Add option="-D__GNU__" />
-					<Add option="-DPTPMONKEY" />
 					<Add option="-DwxDEBUG_LEVEL=0" />
+					<Add option="-DPTPMONKEY" />
 				</Compiler>
 				<Linker>
 					<Add option="`wx-config --libs`" />
@@ -128,17 +128,18 @@
 					<Add library="BasicUsageEnvironment" />
 					<Add library="UsageEnvironment" />
 					<Add library="groupsock" />
-					<Add library="/usr/local/lib/pam2/libptpmonkey.so" />
 					<Add library="pml_log" />
 					<Add library="pml_dnssd" />
 					<Add library="sapserver" />
+					<Add library="ptpmonkey" />
 					<Add directory="/usr/lib/arm-linux-gnueabihf/" />
 				</Linker>
 				<ExtraCommands>
 					<Add after="../manifest_creator/bin/LinuxRelease/manifest_creator" />
 					<Add after="cp ../external/log/lib/* ../lib" />
 					<Add after="cp ../external/dnssd/lib/* ../lib" />
 					<Add after="cp ../external/sapserver/lib/* ../lib" />
+					<Add after="cp ../external/ptpmonkey/bin/* ../lib" />
 					<Mode after="always" />
 				</ExtraCommands>
 			</Target>
@@ -207,6 +208,7 @@
 			<Add directory="../external/log/lib" />
 			<Add directory="../external/dnssd/lib" />
 			<Add directory="../external/sapserver/lib" />
+			<Add directory="../external/ptpmonkey/bin" />
 		</Linker>
 		<Unit filename="AES67ServerMediaSubsession.cpp" />
 		<Unit filename="AES67ServerMediaSubsession.h" />

diff --git a/pambase/pcstats.h b/pambase/pcstats.h
@@ -1,6 +1,7 @@
 #pragma once
 #include "dlldefine.h"
 #include <map>
+#include <wx/string.h>
 
 class PAMBASE_IMPEXPORT pcStats
 {

diff --git a/pambase/ppmtypes.h b/pambase/ppmtypes.h
@@ -2,6 +2,7 @@
 #include <vector>
 #include <map>
 #include "dlldefine.h"
+#include <wx/string.h>
 
 struct PAMBASE_IMPEXPORT ppmtype
 {

diff --git a/pambase/wxptp.cpp b/pambase/wxptp.cpp
@@ -24,6 +24,7 @@ wxDEFINE_EVENT(wxEVT_CLOCK_MSG_FOLLOWUP,wxCommandEvent);
 wxDEFINE_EVENT(wxEVT_CLOCK_MSG_DELAY_REQUEST,wxCommandEvent);
 wxDEFINE_EVENT(wxEVT_CLOCK_MSG_DELAY_RESPONSE,wxCommandEvent);
 
+
 using namespace ptpmonkey;
 
 void wxPtpEventHandler::AddHandler(wxEvtHandler* pHandler)

diff --git a/pamfft/pamfft.cbp b/pamfft/pamfft.cbp
@@ -85,6 +85,7 @@
 					<Add option="-DwxUSE_UNICODE" />
 					<Add option="-D__WXGNU__" />
 					<Add option="-DwxDEBUG_LEVEL=0" />
+					<Add option="-DNDEBUG" />
 				</Compiler>
 				<Linker>
 					<Add option="`wx-config --libs`" />

diff --git a/pamlevel/pamlevel.cbp b/pamlevel/pamlevel.cbp
@@ -89,6 +89,7 @@
 					<Add option="-DwxUSE_UNICODE" />
 					<Add option="-D__WXGNU__" />
 					<Add option="-DwxDEBUG_LEVEL=0" />
+					<Add option="-DNDEBUG" />
 				</Compiler>
 				<Linker>
 					<Add option="`wx-config --libs`" />

diff --git a/pamlevel/truepeakcalculator.cpp b/pamlevel/truepeakcalculator.cpp
@@ -52,7 +52,7 @@ void TruePeakCalculator::InputSession(const session& aSession)
         if(m_nChannels != 0)
         {
             #ifdef __WXMSW__
-                #ifdef __WXDEBUG__
+                #ifndef NDEBUG
                 m_pSrc->pState = src_new (SRC_SINC_FASTEST, min((unsigned int)256 ,aSession.GetCurrentSubsession()->nChannels), &nError);
                 #else
                 m_pSrc->pState = src_new (SRC_SINC_BEST_QUALITY, min((unsigned int)256 ,aSession.GetCurrentSubsession()->nChannels), &nError);

diff --git a/pamupdatemanager/pamupdatemanager.cbp b/pamupdatemanager/pamupdatemanager.cbp
@@ -89,6 +89,7 @@
 					<Add option="-D__WXGNU__" />
 					<Add option="-D_app_" />
 					<Add option="-DwxDEBUG_LEVEL=0" />
+					<Add option="-DNDEBUG" />
 				</Compiler>
 				<Linker>
 					<Add option="`wx-config --libs`" />

diff --git a/plugins/LTC/LTC.cbp b/plugins/LTC/LTC.cbp
@@ -88,6 +88,7 @@
 					<Add option="-DwxUSE_UNICODE" />
 					<Add option="-D__WXGNU__" />
 					<Add option="-DwxDEBUG_LEVEL=0" />
+					<Add option="-DNDEBUG" />
 				</Compiler>
 				<Linker>
 					<Add option="`wx-config --libs`" />

diff --git a/plugins/LTCGenerator/LTCGenerator.cbp b/plugins/LTCGenerator/LTCGenerator.cbp
@@ -90,6 +90,7 @@
 					<Add option="-DwxUSE_UNICODE" />
 					<Add option="-D__WXGNU__" />
 					<Add option="-DwxDEBUG_LEVEL=0" />
+					<Add option="-DNDEBUG" />
 					<Add directory="../../external/libltc" />
 				</Compiler>
 				<Linker>

diff --git a/plugins/MP3Streamer/MP3Streamer.cbp b/plugins/MP3Streamer/MP3Streamer.cbp
@@ -115,6 +115,7 @@
 					<Add option="-DwxUSE_UNICODE" />
 					<Add option="-D__WXGNU__" />
 					<Add option="-DwxDEBUG_LEVEL=0" />
+					<Add option="-DNDEBUG" />
 					<Add directory="$(#live_basicusage.INCLUDE)" />
 					<Add directory="$(#live_group.INCLUDE)" />
 					<Add directory="$(#live_media.INCLUDE)" />

diff --git a/plugins/anglemeters/anglemeters.cbp b/plugins/anglemeters/anglemeters.cbp
@@ -86,6 +86,7 @@
 					<Add option="-DwxUSE_UNICODE" />
 					<Add option="-D__WXGNU__" />
 					<Add option="-DwxDEBUG_LEVEL=0" />
+					<Add option="-DNDEBUG" />
 				</Compiler>
 				<Linker>
 					<Add option="`wx-config --libs`" />

diff --git a/plugins/aoip info/aoip info.cbp b/plugins/aoip info/aoip info.cbp
@@ -86,6 +86,7 @@
 					<Add option="-DPTPMONKEY" />
 					<Add option="-D__GNU__" />
 					<Add option="-DwxDEBUG_LEVEL=0" />
+					<Add option="-DNDEBUG" />
 				</Compiler>
 				<Linker>
 					<Add option="`wx-config --libs`" />

diff --git a/plugins/battery/battery.cbp b/plugins/battery/battery.cbp
@@ -84,6 +84,7 @@
 					<Add option="-DwxUSE_UNICODE" />
 					<Add option="-D__WXGNU__" />
 					<Add option="-DwxDEBUG_LEVEL=0" />
+					<Add option="-DNDEBUG" />
 				</Compiler>
 				<Linker>
 					<Add option="`wx-config --libs`" />

diff --git a/plugins/channel delay/channel delay.cbp b/plugins/channel delay/channel delay.cbp
@@ -86,6 +86,7 @@
 					<Add option="-DwxUSE_UNICODE" />
 					<Add option="-D__WXGNU__" />
 					<Add option="-DwxDEBUG_LEVEL=0" />
+					<Add option="-DNDEBUG" />
 				</Compiler>
 				<Linker>
 					<Add option="`wx-config --libs`" />

diff --git a/plugins/distortion/distortion.cbp b/plugins/distortion/distortion.cbp
@@ -86,6 +86,7 @@
 					<Add option="-DwxUSE_UNICODE" />
 					<Add option="-D__WXGNU__" />
 					<Add option="-DwxDEBUG_LEVEL=0" />
+					<Add option="-DNDEBUG" />
 				</Compiler>
 				<Linker>
 					<Add option="`wx-config --libs`" />

diff --git a/plugins/fft/fft.cbp b/plugins/fft/fft.cbp
@@ -86,6 +86,7 @@
 					<Add option="-DwxUSE_UNICODE" />
 					<Add option="-D__WXGNU__" />
 					<Add option="-DwxDEBUG_LEVEL=0" />
+					<Add option="-DNDEBUG" />
 				</Compiler>
 				<Linker>
 					<Add option="`wx-config --libs`" />

diff --git a/plugins/fftphase/CMakeLists.txt b/plugins/fftphase/CMakeLists.txt
@@ -19,17 +19,18 @@ file(GLOB SOURCES "*.cpp")
 
 add_library(fftphase MODULE ${SOURCES})
 
-target_compile_definitions(fftphase PUBLIC DLL_EXPORTS wxUSE_UNICODE _monitor_ _MSL_STDINT_H wxDEBUG_LEVEL=0)
+target_compile_definitions(fftphase PUBLIC DLL_EXPORTS wxUSE_UNICODE _monitor_ _MSL_STDINT_H)
 
-list(APPEND flags "-fPIC" "-Wall" "-fpermissive" "-O3")
+list(APPEND flags "-fPIC" "-Wall" "-fpermissive" "-O3" "-std=c++14")
 
 if(CMAKE_BUILD_TYPE STREQUAL "Release")
 	list(APPEND flags "-O3")
-	target_compile_definitions(fft PUBLIC NDEBUG)
+	target_compile_definitions(fftphase PUBLIC NDEBUG wxDEBUG_LEVEL=0)
+	set_target_properties(fftphase PROPERTIES LIBRARY_OUTPUT_DIRECTORY "../../../lib/monitor")
 elseif(CMAKE_BUILD_TYPE STREQUAL "Debug")
 	list(APPEND flags "-Og")
-	target_compile_options(fft PRIVATE ${flags})
-	target_compile_definitions(fft PUBLIC __WXDEBUG__)
+	target_compile_definitions(fftphase PUBLIC __WXDEBUG__)
+	set_target_properties(fftphase PROPERTIES LIBRARY_OUTPUT_DIRECTORY "../../../lib/monitor/debug")
 endif()
 
 target_compile_options(fftphase PRIVATE ${flags})
@@ -49,7 +50,7 @@ target_link_libraries(fftphase ${wxWidgets_LIBRARIES})
 target_link_libraries(fftphase pambase)
 target_link_libraries(fftphase pamfft)
 
-set_target_properties(fftphase PROPERTIES LIBRARY_OUTPUT_DIRECTORY "../../../lib/monitor")
+
 
 #linux specific
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")

diff --git a/plugins/fftphase/fftphase.cbp b/plugins/fftphase/fftphase.cbp
@@ -86,6 +86,7 @@
 					<Add option="-DwxUSE_UNICODE" />
 					<Add option="-D__WXGNU__" />
 					<Add option="-DwxDEBUG_LEVEL=0" />
+					<Add option="-DNDEBUG" />
 				</Compiler>
 				<Linker>
 					<Add option="`wx-config --libs`" />

diff --git a/plugins/identify/identify.cbp b/plugins/identify/identify.cbp
@@ -84,6 +84,7 @@
 					<Add option="-DwxUSE_UNICODE" />
 					<Add option="-D__WXGNU__" />
 					<Add option="-DwxDEBUG_LEVEL=0" />
+					<Add option="-DNDEBUG" />
 				</Compiler>
 				<Linker>
 					<Add option="`wx-config --libs`" />

diff --git a/plugins/levels/levels.cbp b/plugins/levels/levels.cbp
@@ -84,6 +84,7 @@
 					<Add option="-DwxUSE_UNICODE" />
 					<Add option="-D__WXGNU__" />
 					<Add option="-DwxDEBUG_LEVEL=0" />
+					<Add option="-DNDEBUG" />
 				</Compiler>
 				<Linker>
 					<Add option="`wx-config --libs`" />

diff --git a/plugins/lineup/lineup.cbp b/plugins/lineup/lineup.cbp
@@ -90,6 +90,7 @@
 					<Add option="-DwxUSE_UNICODE" />
 					<Add option="-D__WXGNU__" />
 					<Add option="-DwxDEBUG_LEVEL=0" />
+					<Add option="-DNDEBUG" />
 				</Compiler>
 				<Linker>
 					<Add option="`wx-config --libs`" />

diff --git a/plugins/lissajou/lissajou.cbp b/plugins/lissajou/lissajou.cbp
@@ -86,6 +86,7 @@
 					<Add option="-DwxUSE_UNICODE" />
 					<Add option="-D__WXGNU__" />
 					<Add option="-DwxDEBUG_LEVEL=0" />
+					<Add option="-DNDEBUG" />
 				</Compiler>
 				<Linker>
 					<Add option="`wx-config --libs`" />

diff --git a/plugins/meters/meters.cbp b/plugins/meters/meters.cbp
@@ -87,6 +87,7 @@
 					<Add option="-DwxUSE_UNICODE" />
 					<Add option="-D__WXGNU__" />
 					<Add option="-DwxDEBUG_LEVEL=0" />
+					<Add option="-DNDEBUG" />
 				</Compiler>
 				<Linker>
 					<Add option="`wx-config --libs`" />

diff --git a/plugins/peak count/peakcount.cbp b/plugins/peak count/peakcount.cbp
@@ -84,6 +84,7 @@
 					<Add option="-DwxUSE_UNICODE" />
 					<Add option="-D__WXGNU__" />
 					<Add option="-DwxDEBUG_LEVEL=0" />
+					<Add option="-DNDEBUG" />
 				</Compiler>
 				<Linker>
 					<Add option="`wx-config --libs`" />

diff --git a/plugins/peak log/peak log.cbp b/plugins/peak log/peak log.cbp
@@ -84,6 +84,7 @@
 					<Add option="-DwxUSE_UNICODE" />
 					<Add option="-D__WXGNU__" />
 					<Add option="-DwxDEBUG_LEVEL=0" />
+					<Add option="-DNDEBUG" />
 				</Compiler>
 				<Linker>
 					<Add option="`wx-config --libs`" />

diff --git a/plugins/polarscope/polarscope.cbp b/plugins/polarscope/polarscope.cbp
@@ -85,6 +85,7 @@
 					<Add option="-DwxUSE_UNICODE" />
 					<Add option="-D__WXGNU__" />
 					<Add option="-DwxDEBUG_LEVEL=0" />
+					<Add option="-DNDEBUG" />
 				</Compiler>
 				<Linker>
 					<Add option="`wx-config --libs`" />

diff --git a/plugins/ptp/ptp.cbp b/plugins/ptp/ptp.cbp
@@ -86,6 +86,7 @@
 					<Add option="-D__WXGNU__" />
 					<Add option="-D__GNU__" />
 					<Add option="-DwxDEBUG_LEVEL=0" />
+					<Add option="-DNDEBUG" />
 					<Add directory="pml_log" />
 				</Compiler>
 				<Linker>

diff --git a/plugins/r128/r128.cbp b/plugins/r128/r128.cbp
@@ -89,6 +89,7 @@
 					<Add option="-DwxUSE_UNICODE" />
 					<Add option="-D__WXGNU__" />
 					<Add option="-DwxDEBUG_LEVEL=0" />
+					<Add option="-DNDEBUG" />
 				</Compiler>
 				<Linker>
 					<Add option="`wx-config --libs`" />

diff --git a/plugins/radar/radar.cbp b/plugins/radar/radar.cbp
@@ -86,6 +86,7 @@
 					<Add option="-DwxUSE_UNICODE" />
 					<Add option="-D__WXGNU__" />
 					<Add option="-DwxDEBUG_LEVEL=0" />
+					<Add option="-DNDEBUG" />
 				</Compiler>
 				<Linker>
 					<Add option="`wx-config --libs`" />

diff --git a/plugins/record/record.cbp b/plugins/record/record.cbp
@@ -84,6 +84,7 @@
 					<Add option="-DwxUSE_UNICODE" />
 					<Add option="-D__WXGNU__" />
 					<Add option="-DwxDEBUG_LEVEL=0" />
+					<Add option="-DNDEBUG" />
 				</Compiler>
 				<Linker>
 					<Add option="`wx-config --libs`" />

diff --git a/plugins/scope/scope.cbp b/plugins/scope/scope.cbp
@@ -86,6 +86,7 @@
 					<Add option="-DwxUSE_UNICODE" />
 					<Add option="-D__WXGNU__" />
 					<Add option="-DwxDEBUG_LEVEL=0" />
+					<Add option="-DNDEBUG" />
 				</Compiler>
 				<Linker>
 					<Add option="`wx-config --libs`" />

diff --git a/plugins/spectogram/spectogram.cbp b/plugins/spectogram/spectogram.cbp
@@ -87,6 +87,7 @@
 					<Add option="-DwxUSE_UNICODE" />
 					<Add option="-D__WXGNU__" />
 					<Add option="-DwxDEBUG_LEVEL=0" />
+					<Add option="-DNDEBUG" />
 				</Compiler>
 				<Linker>
 					<Add option="`wx-config --libs`" />
-Original file line number
+Diff line change
@@ Expand Up @@
                     }
                 }
             }
+            return True;
         }
+        return False;
     }
@@ Expand Down @@