Switched to libc++ in Makefile, fixed casting error in wxMessageBox

software/drsosc/DOFrame.cpp

@@ -1359,7 +1359,7 @@ void DOFrame::OnTimer(wxTimerEvent& event)
 
          str.Printf(wxT("This board was calibrated at %1.2lg V ... %1.2lg V\nYou must recalibrate the board if you use a different input range"), 
             GetOsci()->GetCalibratedInputRange()-0.5, GetOsci()->GetCalibratedInputRange()+0.5);
-         wxMessageBox((const wxChar*)wxString::FromAscii((const char*)str), wxT("DRS Oscilloscope Warning"), wxOK | wxICON_EXCLAMATION, this);
+         wxMessageBox(str, wxT("DRS Oscilloscope Warning"), wxOK | wxICON_EXCLAMATION, this);
       }
       
       // issue warning if timing calibration not valid

software/drsosc/Makefile

@@ -29,7 +29,7 @@ OUTNAME       = drsosc
 
 # OS specific flags
 ifeq ($(OSTYPE),Darwin)
-CFLAGS        += -DOS_DARWIN -stdlib=libstdc++
+CFLAGS        += -DOS_DARWIN -stdlib=libc++
 LIBS          += -lusb-1.0
 endif