beebasm

changeset 24:282c9368835b
Corrected build problems with GCC 4.
author: RichTW <richtw1@gmail.com>
date: Sun Feb 27 12:27:24 2011 +0100
parents: 1f49259b73aa
children: 33bd79335c1e
files: beebasm.exe demo.ssd src/Makefile src/assemble.cpp src/commands.cpp src/discimage.cpp src/expression.cpp src/main.cpp
diffstat: 8 files changed, 7 insertions(+), 2 deletions(-) [+]
[-]

beebasm.exe 0

demo.ssd 0

src/Makefile 2

src/assemble.cpp 1

src/commands.cpp 1

src/discimage.cpp 2

src/expression.cpp 1

src/main.cpp 2 beebasm.exe 0 demo.ssd 0 src/Makefile 2 src/assemble.cpp 1 src/commands.cpp 1 src/discimage.cpp 2 src/expression.cpp 1 src/main.cpp 2
beebasm.exe 0
demo.ssd 0
     3.1 --- a/src/Makefile	Sun May 02 12:29:48 2010 +0100
     3.2 +++ b/src/Makefile	Sun Feb 27 12:27:24 2011 +0100
     3.3 @@ -39,7 +39,7 @@
     3.4  
     3.5  # Define linker switches
     3.6  
     3.7 -LDFLAGS			:=		-s
     3.8 +LDFLAGS			:=		-s -static
     3.9  
    3.10  # Define 2nd party libs to link
    3.11  

     4.1 --- a/src/assemble.cpp	Sun May 02 12:29:48 2010 +0100
     4.2 +++ b/src/assemble.cpp	Sun Feb 27 12:27:24 2011 +0100
     4.3 @@ -24,6 +24,7 @@
     4.4  
     4.5  #include <iostream>
     4.6  #include <iomanip>
     4.7 +#include <cstring>
     4.8  
     4.9  #include "lineparser.h"
    4.10  #include "globaldata.h"

     5.1 --- a/src/commands.cpp	Sun May 02 12:29:48 2010 +0100
     5.2 +++ b/src/commands.cpp	Sun Feb 27 12:27:24 2011 +0100
     5.3 @@ -25,6 +25,7 @@
     5.4  #include <iostream>
     5.5  #include <iomanip>
     5.6  #include <string>
     5.7 +#include <cstring>
     5.8  
     5.9  #include "lineparser.h"
    5.10  #include "globaldata.h"

     6.1 --- a/src/discimage.cpp	Sun May 02 12:29:48 2010 +0100
     6.2 +++ b/src/discimage.cpp	Sun Feb 27 12:27:24 2011 +0100
     6.3 @@ -20,6 +20,8 @@
     6.4  */
     6.5  /*************************************************************************************************/
     6.6  
     6.7 +#include <cstdlib>
     6.8 +#include <cstring>
     6.9  #include "discimage.h"
    6.10  #include "asmexception.h"
    6.11  #include "globaldata.h"

     7.1 --- a/src/expression.cpp	Sun May 02 12:29:48 2010 +0100
     7.2 +++ b/src/expression.cpp	Sun Feb 27 12:27:24 2011 +0100
     7.3 @@ -23,6 +23,7 @@
     7.4  /*************************************************************************************************/
     7.5  
     7.6  #include <cmath>
     7.7 +#include <cstring>
     7.8  #include <cerrno>
     7.9  #include <sstream>
    7.10  #include <iomanip>

     8.1 --- a/src/main.cpp	Sun May 02 12:29:48 2010 +0100
     8.2 +++ b/src/main.cpp	Sun Feb 27 12:27:24 2011 +0100
     8.3 @@ -172,7 +172,7 @@
     8.4  		return EXIT_FAILURE;
     8.5  	}
     8.6  
     8.7 -	if ( pDiscInputFile != NULL && pDiscOutputFile == NULL ||
     8.8 +	if ( ( pDiscInputFile != NULL && pDiscOutputFile == NULL ) ||
     8.9  		 ( pDiscInputFile != NULL && pDiscOutputFile != NULL && strcmp( pDiscInputFile, pDiscOutputFile ) == 0 ) )
    8.10  	{
    8.11  		cerr << "If a disc image file is provided as input, a different filename must be provided as output" << endl;