xamos, fix build (#3946)

* fix build for gcc2
This commit is contained in:
Schrijvers Luc
2019-06-22 12:22:54 +02:00
committed by GitHub
parent 5c448d1048
commit 44a6bd2be9
2 changed files with 75 additions and 20 deletions

View File

@@ -1,4 +1,4 @@
From f02982020ebc693e0f1c6f10523fa54282a42cce Mon Sep 17 00:00:00 2001
From f7af06ad9b75700c3db04963b98adadddd0d52e0 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Thu, 1 May 2014 13:52:57 +0200
Subject: Fix build on gcc2, add Haiku makefile.
@@ -77,5 +77,40 @@ index 0000000..25e31e6
+ rm -rf $(EXECUTABLE) *.o
+
--
1.8.3.4
2.21.0
From 80480b943ab71310e7bbd02289cd514056406dc8 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Fri, 21 Jun 2019 09:17:41 +0200
Subject: Fix build, add install
diff --git a/src/Makefile_haiku b/src/Makefile_haiku
index 25e31e6..e9cb4b8 100644
--- a/src/Makefile_haiku
+++ b/src/Makefile_haiku
@@ -2,6 +2,7 @@ CC=g++
CFLAGS=-c -Wall -pedantic -Wno-deprecated -O3 -D USESDL
LDFLAGS=-lSDL_image -lSDL_gfx -lSDL_mixer -ljpeg -lpng -lvorbisfile -lvorbis -logg -lSDL_ttf -lfreetype -lz -lSDL -lGL -lGLU
+SDL_CFLAGS=`sdl-config --cflags`
SOURCES=main.cpp XAMOS.cpp SDL_collide.cpp Console.cpp AMALDebugTest.cpp PrintStream.cpp AMALBank.cpp AMALEnvGen.cpp AMALParser.cpp AMALInterpreter.cpp AMALCompiler.cpp AmalPrograms.cpp Timer.cpp AMOS_Sprite.cpp MequaScript.cpp AMOS_System.cpp GameEngineWrapper.cpp Mytype.cpp Mytypearray.cpp TheTokens.cpp Parser.cpp Dumper.cpp Interpreter.cpp CommandWrapper.cpp ActiveObject.cpp
OBJECTS=$(SOURCES:.cpp=.o)
@@ -13,7 +14,11 @@ $(EXECUTABLE): $(OBJECTS)
$(CC) $(OBJECTS) -o $@ $(LDFLAGS)
.cpp.o:
- $(CC) $(CFLAGS) $< -o $@
+ $(CC) $(CFLAGS) ${SDL_CFLAGS} $< -o $@
+
+install:
+ install -d $(PREFIX)/bin
+ install -m 755 ../XAMOS $(PREFIX)/bin
clean:
rm -rf $(EXECUTABLE) *.o
--
2.21.0