diff options
| -rw-r--r-- | Makefile.common | 2 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | graphics/module.mk | 2 | ||||
| -rw-r--r-- | tools/create_msvc/create_msvc.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.common b/Makefile.common index 0e3f4d9a26..ff0e4a8b25 100644 --- a/Makefile.common +++ b/Makefile.common @@ -131,7 +131,7 @@ endif $(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) @@ -2188,7 +2188,7 @@ if test "$_have_x86" = yes ; then 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 diff --git a/graphics/module.mk b/graphics/module.mk index 378ec97747..fde78b130a 100644 --- a/graphics/module.mk +++ b/graphics/module.mk @@ -53,7 +53,7 @@ MODULE_OBJS += \ scaler/hq2x.o \ scaler/hq3x.o -ifdef HAVE_NASM +ifdef USE_NASM MODULE_OBJS += \ scaler/hq2x_i386.o \ scaler/hq3x_i386.o diff --git a/tools/create_msvc/create_msvc.cpp b/tools/create_msvc/create_msvc.cpp index 6e65539841..5dd4b05ffb 100644 --- a/tools/create_msvc/create_msvc.cpp +++ b/tools/create_msvc/create_msvc.cpp @@ -834,7 +834,7 @@ const Feature s_features[] = { // 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 |