[Scummvm-cvs-logs] SF.net SVN: scummvm:[48208] scummvm/trunk

[lordhoto at users.sourceforge.net]

Revision: 48208
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48208&view=rev
Author:   lordhoto
Date:     2010-03-08 23:56:59 +0000 (Mon, 08 Mar 2010)

Log Message:
-----------
Conistenlty use USE_NASM instead of using HAVE_NASM in config.mk (this matches all the external library use too).

Modified Paths:
--------------
    scummvm/trunk/Makefile.common
    scummvm/trunk/configure
    scummvm/trunk/graphics/module.mk
    scummvm/trunk/tools/create_msvc/create_msvc.cpp

Modified: scummvm/trunk/Makefile.common
===================================================================
--- scummvm/trunk/Makefile.common	2010-03-08 23:36:59 UTC (rev 48207)
+++ scummvm/trunk/Makefile.common	2010-03-08 23:56:59 UTC (rev 48208)
@@ -131,7 +131,7 @@
 	$(QUIET)$(MKDIR) $(*D)/$(DEPDIR)
 	$(QUIET_AS)$(CXX) $(CXX_UPDATE_DEP_FLAG) $(ASFLAGS) -c $(<) -o $*.o
 
-ifdef HAVE_NASM
+ifdef USE_NASM
 # Build rule for NASM assembler files
 %.o: %.asm
 	$(QUIET)$(MKDIR) $(*D)

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2010-03-08 23:36:59 UTC (rev 48207)
+++ scummvm/trunk/configure	2010-03-08 23:56:59 UTC (rev 48208)
@@ -2188,7 +2188,7 @@
 fi
 
 add_to_config_h_if_yes $_nasm '#define USE_NASM'
-add_to_config_mk_if_yes $_nasm 'HAVE_NASM = 1'
+add_to_config_mk_if_yes $_nasm 'USE_NASM = 1'
 
 #
 # Enable vkeybd / keymapper

Modified: scummvm/trunk/graphics/module.mk
===================================================================
--- scummvm/trunk/graphics/module.mk	2010-03-08 23:36:59 UTC (rev 48207)
+++ scummvm/trunk/graphics/module.mk	2010-03-08 23:56:59 UTC (rev 48208)
@@ -53,7 +53,7 @@
 	scaler/hq2x.o \
 	scaler/hq3x.o
 
-ifdef HAVE_NASM
+ifdef USE_NASM
 MODULE_OBJS += \
 	scaler/hq2x_i386.o \
 	scaler/hq3x_i386.o

Modified: scummvm/trunk/tools/create_msvc/create_msvc.cpp
===================================================================
--- scummvm/trunk/tools/create_msvc/create_msvc.cpp	2010-03-08 23:36:59 UTC (rev 48207)
+++ scummvm/trunk/tools/create_msvc/create_msvc.cpp	2010-03-08 23:56:59 UTC (rev 48208)
@@ -834,7 +834,7 @@
 	// ScummVM feature flags
 	{   "16bit", "USE_RGB_COLOR", "", true, "16bit color support" },
 	{ "mt32emu",   "USE_MT32EMU", "", true, "integrated MT-32 emulator" },
-	{    "nasm",     "HAVE_NASM", "", true, "IA-32 assembly support" }, // This feature is special in the regard, that it needs additional handling.
+	{    "nasm",      "USE_NASM", "", true, "IA-32 assembly support" }, // This feature is special in the regard, that it needs additional handling.
 };
 } // End of anonymous namespace
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.