github.com/aap.pdp6
1
0
Fork 0
mirror of https://github.com/aap/pdp6.git synced 2026-05-02 14:30:03 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1 from larsbrinkhoff/master

Browse Source 
Use sdl-config and pkg-config to add compiler flags.
This commit is contained in:
aap
2016-05-13 08:56:48 +02:00
parent 1452e2c856 4ada97372a
commit 31adf43f2e
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -3,9 +3,11 @@ SRC=main.c apr.c mem.c tty.c
#CFLAGS= -Wno-shift-op-parentheses -Wno-logical-op-parentheses \ #CFLAGS= -Wno-shift-op-parentheses -Wno-logical-op-parentheses \
# -Wno-bitwise-op-parentheses # -Wno-bitwise-op-parentheses
CFLAGS= -fno-diagnostics-show-caret \ CFLAGS= -fno-diagnostics-show-caret \
-L/usr/local/lib -I/usr/local/include -lSDL -lSDL_image -lpthread `sdl-config --cflags` `pkg-config SDL_image --cflags`
LIBS= `sdl-config --libs` `pkg-config SDL_image --libs` -lpthread
pdp6: $(SRC) pdp6.h pdp6: $(SRC) pdp6.h
$(CC) $(CFLAGS) $(SRC) -o pdp6 $(CC) $(CFLAGS) $(SRC) $(LIBS) -o pdp6

4
main.c
View File

@@ -1,6 +1,6 @@
#include "pdp6.h" #include "pdp6.h"
#include <SDL/SDL.h> #include <SDL.h>
#include <SDL/SDL_image.h> #include <SDL_image.h>
#include <pthread.h> #include <pthread.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>