diff --git a/VBA2008.vcproj b/VBA2008.vcproj index 812750ba..0108d3e2 100644 --- a/VBA2008.vcproj +++ b/VBA2008.vcproj @@ -165,7 +165,7 @@ FavorSizeOrSpeed="1" WholeProgramOptimization="true" AdditionalIncludeDirectories=""..\dependencies\File_Extractor-0.4.3\fex";..\dependencies\msvc" - PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;OEMRESOURCE;MMX;ASM;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAS_FILE_EXTRACTOR" + PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;GBA_LOGGING;OEMRESOURCE;MMX;ASM;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAS_FILE_EXTRACTOR" RuntimeLibrary="0" BufferSecurityCheck="false" EnableEnhancedInstructionSet="0" diff --git a/src/agb/GBAinline.h b/src/agb/GBAinline.h index ebd9770e..833e3f30 100644 --- a/src/agb/GBAinline.h +++ b/src/agb/GBAinline.h @@ -63,7 +63,6 @@ extern int cpuTotalTicks; static inline u32 CPUReadMemory(u32 address) { - #ifdef GBA_LOGGING if(address & 3) { if(systemVerbose & VERBOSE_UNALIGNED_MEMORY) { diff --git a/src/win32/OpenAL.cpp b/src/win32/OpenAL.cpp index 1e645543..288bcf5d 100644 --- a/src/win32/OpenAL.cpp +++ b/src/win32/OpenAL.cpp @@ -289,7 +289,6 @@ void OpenAL::write() ALFunction.alGetSourcei( source, AL_BUFFERS_PROCESSED, &nBuffersProcessed ); ASSERT_SUCCESS; -#ifdef _DEBUG if( nBuffersProcessed == theApp.oalBufferCount ) { // we only want to know about it when we are emulating at full speed or faster: if( ( theApp.throttle >= 100 ) || ( theApp.throttle == 0 ) ) { @@ -299,7 +298,6 @@ void OpenAL::write() } } } -#endif if( !speedup && synchronize && !theApp.throttle ) { // wait until at least one buffer has finished diff --git a/src/win32/VBA.rc b/src/win32/VBA.rc index 7910bf1c..a1b0d6cf 100644 --- a/src/win32/VBA.rc +++ b/src/win32/VBA.rc @@ -12,7 +12,6 @@ ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS - ///////////////////////////////////////////////////////////////////////////// // English (U.S.) resources @@ -812,8 +811,9 @@ BEGIN LTEXT "",IDC_PORT,143,7,36,8,SS_NOPREFIX END -IDD_LOGGING DIALOGEX 0, 0, 381, 221 +IDD_LOGGING DIALOGEX 0, 0, 382, 220 STYLE DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_TOOLWINDOW CAPTION "Logging" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN @@ -1376,9 +1376,9 @@ BEGIN IDD_LOGGING, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 374 + RIGHTMARGIN, 375 TOPMARGIN, 7 - BOTTOMMARGIN, 214 + BOTTOMMARGIN, 213 END IDD_EXPORT_SPS, DIALOG diff --git a/src/win32/XAudio2.cpp b/src/win32/XAudio2.cpp index bf46d917..a634aa29 100644 --- a/src/win32/XAudio2.cpp +++ b/src/win32/XAudio2.cpp @@ -254,7 +254,6 @@ void XAudio2_Output::write() ASSERT( vState.BuffersQueued <= NBUFFERS ); if( vState.BuffersQueued < NBUFFERS ) { -#ifdef _DEBUG if( vState.BuffersQueued == 0 ) { // buffers ran dry if( systemVerbose & VERBOSE_SOUNDOUTPUT ) { @@ -262,7 +261,6 @@ void XAudio2_Output::write() log( "XAudio2: Buffers were not refilled fast enough (i=%i)\n", i++ ); } } -#endif // there is at least one free buffer break; } else {