// monitoring window for running BSP processes (and possibly various other stuff)
#include "watchbsp.h"
+#include "globaldefs.h"
#include <algorithm>
Build_constructPreferences( page );
}
void Build_registerPreferencesPage(){
- PreferencesDialog_addSettingsPage( FreeCaller1<PreferenceGroup&, Build_constructPage>() );
+ PreferencesDialog_addSettingsPage( makeCallbackF(Build_constructPage) );
}
#include "preferencesystem.h"
}
if ( data->recurse == data->stop_depth ) {
message_flush( data );
-#ifdef _DEBUG
+#if GDEF_DEBUG
globalOutputStream() << "Received error msg .. shutting down..\n";
#endif
GetWatchBSP()->EndMonitoringLoop();
}
bool CWatchBSP::SetupListening(){
-#ifdef _DEBUG
+#if GDEF_DEBUG
if ( m_pListenSocket ) {
globalOutputStream() << "ERROR: m_pListenSocket != NULL in CWatchBSP::SetupListening\n";
return false;
}
-#if defined( WIN32 )
-#define ENGINE_ATTRIBUTE "engine_win32"
-#define MP_ENGINE_ATTRIBUTE "mp_engine_win32"
-#elif defined( __linux__ ) || defined ( __FreeBSD__ )
-#define ENGINE_ATTRIBUTE "engine_linux"
-#define MP_ENGINE_ATTRIBUTE "mp_engine_linux"
-#elif defined( __APPLE__ )
-#define ENGINE_ATTRIBUTE "engine_macos"
-#define MP_ENGINE_ATTRIBUTE "mp_engine_macos"
+#if GDEF_OS_WINDOWS
+const char *ENGINE_ATTRIBUTE = "engine_win32";
+const char *MP_ENGINE_ATTRIBUTE = "mp_engine_win32";
+#elif GDEF_OS_LINUX || GDEF_OS_BSD
+const char *ENGINE_ATTRIBUTE = "engine_linux";
+const char *MP_ENGINE_ATTRIBUTE = "mp_engine_linux";
+#elif GDEF_OS_MACOS
+const char *ENGINE_ATTRIBUTE = "engine_macos";
+const char *MP_ENGINE_ATTRIBUTE = "mp_engine_macos";
#else
#error "unsupported platform"
#endif
#endif
return;
}
-#ifdef _DEBUG
+#if GDEF_DEBUG
// some debug checks
if ( !m_pListenSocket ) {
globalErrorStream() << "ERROR: m_pListenSocket == NULL in CWatchBSP::RoutineProcessing EBeginStep state\n";
break;
case EWatching:
{
-#ifdef _DEBUG
+#if GDEF_DEBUG
// some debug checks
if ( !m_pInSocket ) {
globalErrorStream() << "ERROR: m_pInSocket == NULL in CWatchBSP::RoutineProcessing EWatching state\n";