From a7e0c3d0ac7b4f18a5d7b24d84fa2f8a09a11eae Mon Sep 17 00:00:00 2001
From: olsner <simon@wildfiregames.com>
Date: Mon, 26 Sep 2005 05:39:58 +0000
Subject: [PATCH] fix for the underscore problem in the assembler symbols

This was SVN commit r2766.
---
 build/premake/src/Src/gnu.c     | 7 +++++--
 build/premake/src/Src/project.h | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/build/premake/src/Src/gnu.c b/build/premake/src/Src/gnu.c
index 16d1dba422..e4bfb4ba8a 100644
--- a/build/premake/src/Src/gnu.c
+++ b/build/premake/src/Src/gnu.c
@@ -377,8 +377,11 @@ static int writeCppPackage(Package* package)
 			{
 				/*	nasm -f elf -o $@ $<
 					nasm -M -o $@ $< >OBJ_DIR/$*.P */
-				fprintf(file, "\t%snasm -f elf -o $@ $<\n", prefix);
-				fprintf(file, "\t%snasm -M -o $@ $< >$(<F).d\n", prefix);
+				const char *extraOpts="";
+				if (strcmp(osIdent, "windows"))
+					extraOpts="-dDONT_USE_UNDERLINE=1";
+				fprintf(file, "\t%snasm %s -f elf -o $@ $<\n", prefix, extraOpts);
+				fprintf(file, "\t%snasm %s -M -o $@ $< >$(<F).d\n", prefix, extraOpts);
 			}
 			else
 				fprintf(file, "\t%s$(CXX) $(CXXFLAGS) -MD -o $@ -c $<\n", prefix);
diff --git a/build/premake/src/Src/project.h b/build/premake/src/Src/project.h
index 501b4bd381..6dffb32ff7 100644
--- a/build/premake/src/Src/project.h
+++ b/build/premake/src/Src/project.h
@@ -86,4 +86,4 @@ extern void setProjectOption(char* option);
 
 // Access to the lua objects
 extern int getProject();
-extern const char* getString(int ref, char* name);
\ No newline at end of file
+extern const char* getString(int ref, char* name);