From 8d0f7d6023b115ca3bf43b0b34622b419c2aec73 Mon Sep 17 00:00:00 2001 From: spacy51 Date: Sun, 2 Dec 2007 00:18:52 +0000 Subject: [PATCH] assembler routine now activated with #ifndef C_CORE instead of #ifdef ASM --- trunk/src/win32/display.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/trunk/src/win32/display.cpp b/trunk/src/win32/display.cpp index bd6ffa3f..43c13ecb 100644 --- a/trunk/src/win32/display.cpp +++ b/trunk/src/win32/display.cpp @@ -21,7 +21,7 @@ void copyImage( void *source, void *destination, unsigned int width, unsigned int height, unsigned int destinationPitch, unsigned int colorDepth ) { -#ifdef ASM +#ifndef C_CORE // Copy the image at [source] to the locked Direct3D texture __asm @@ -75,7 +75,7 @@ gbaLoop24bit: gbaLoopEnd: } -#else // #ifdef ASM +#else // #ifndef C_CORE // optimized C version register unsigned int lineSize; @@ -120,4 +120,3 @@ gbaLoopEnd: #endif } -