File oldspark-c++-src.dif of Package oldspark-c++
--- OldSpark-C++/Makefile
+++ OldSpark-C++/Makefile
@@ -1,6 +1,6 @@
#Zlib
Z_LIB_DIR= ./zlib/
-Z_LIB = $(Z_LIB_DIR)libz.a
+Z_LIB = -lz
#unzip based on zlib.
UNZIP_DIR= ./unzip/
@@ -59,7 +59,7 @@
# Compiler/Linker Flags
# add -O3 to CFLAGS for speedup -pg on LFLAGS and CFLAGS for gprof
-CFLAGS = -Wall -O3
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
LFLAGS = -lSDL
AFLAGS = -f elf
CC = g++
@@ -70,14 +70,14 @@
.cpp.o:
$(CC) $(CFLAGS) -c $*.cpp -o $*.o
-all: libs disasm oldspark stripexe
+all: libs disasm oldspark
oldspark: $(z80_lib) $(OSM_OBJS) $(OPT_OBJS)
$(CC) $(CFLAGS) $(OSM_OBJS) $(Z80_LIB) $(OPT_OBJS) $(UNZIP_LIB) $(Z_LIB) -o $(PRJ_EXE) $(LFLAGS)
disasm: $(DISASM_OBJS)
-stripexe:
+stripexe: oldspark
strip -s $(PRJ_EXE)
clean:
@@ -98,5 +98,4 @@
rm -f *.o core $(PRJ_EXE)
libs:
- cd $(Z_LIB_DIR) && make libz.a
cd $(UNZIP_DIR) && make unzip.a
--- OldSpark-C++/NullVideoFilter.cpp
+++ OldSpark-C++/NullVideoFilter.cpp
@@ -14,6 +14,7 @@
#include "VideoFilter.h"
#include "NullVideoFilter.h"
+#include <string.h>
NullVideoFilter::NullVideoFilter(int w, int h)
{
--- OldSpark-C++/OBitmap.cpp
+++ OldSpark-C++/OBitmap.cpp
@@ -14,6 +14,7 @@
*****************************************************************************/
#include "OBitmap.h"
+#include <string.h>
/* This constructor will allocate data buffer. */
OBitmap::OBitmap(s32 w, s32 h) : width_(w), height_(h)
--- OldSpark-C++/PrecisionTimer.cpp
+++ OldSpark-C++/PrecisionTimer.cpp
@@ -12,6 +12,7 @@
* URL: http://bcz.emu-france.com/
*****************************************************************************/
#include "PrecisionTimer.h"
+#include <stdlib.h>
#define rdtsc(val) __asm__ __volatile__ ("rdtsc" : "=A" (val))
--- OldSpark-C++/RomLoader.cpp
+++ OldSpark-C++/RomLoader.cpp
@@ -18,6 +18,7 @@
#include <iomanip>
#include "RomLoader.h"
#include "unzip/unzip.h"
+#include <string.h>
using namespace std;
--- OldSpark-C++/TextWriter.cpp
+++ OldSpark-C++/TextWriter.cpp
@@ -13,7 +13,7 @@
* URL: http://bcz.emu-france.com/
*****************************************************************************/
#include "TextWriter.h"
-
+#include <string.h>
/*--------------------------------------------------------------------*/
/* This array contains 8x496 pixels picture of our font. Each value is*/
--- OldSpark-C++/machine/Solomon_Hdwr/Solomon.cpp
+++ OldSpark-C++/machine/Solomon_Hdwr/Solomon.cpp
@@ -13,6 +13,7 @@
*****************************************************************************/
#include "Solomon.h"
+#include <string.h>
/* Constructor: Call Z80_AY3_soundboard constructor with same parameters.*/
SolomonSoundBoard::SolomonSoundBoard(u8 a, u32 b, u32 c) : Z80_AY3_soundboard(a, b, c)
--- OldSpark-C++/unzip/Makefile
+++ OldSpark-C++/unzip/Makefile
@@ -1,5 +1,5 @@
CC=cc
-CFLAGS=-O
+CFLAGS=$(RPM_OPT_FLAGS)
UNZ_OBJS = unzip.o ioapi.o