izaya
/
collapseos
mirror of https://github.com/hsoft/collapseos.git
1
0
Fork 0
Code Issues Releases Wiki Activity

emul/hw/(ti|sms): fix compilation with gcc 

It seems to be picky about where it accepts its link flags.
This commit is contained in:
Virgil Dupras 2020-01-09 08:33:08 -05:00
parent 6acd22492c
commit 66744c0026
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
emul/hw/sms/Makefile
View File

@ -2,12 +2,13 @@ EXTOBJS = ../../emul.o ../../libz80/libz80.o
OBJS = sms.o vdp.o OBJS = sms.o vdp.o
TARGET = sms TARGET = sms
CFLAGS += `pkg-config --cflags xcb` CFLAGS += `pkg-config --cflags xcb`
LDFLAGS += `pkg-config --libs xcb`
.PHONY: all .PHONY: all
all: $(TARGET) all: $(TARGET)
$(TARGET): $(OBJS) $(EXTOBJS) $(TARGET): $(OBJS) $(EXTOBJS)
$(CC) `pkg-config --libs xcb` $(OBJS) $(EXTOBJS) -o $@ $(CC) $(OBJS) $(EXTOBJS) -o $@ $(LDFLAGS)
.PHONY: clean .PHONY: clean
clean: clean:

2
emul/hw/sms/sms.c
View File

@ -65,7 +65,7 @@ void create_window()
win, win,
screen->root, screen->root,
0, 0, 0, 0,
150, 150, 500, 500,
10, 10,
XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_WINDOW_CLASS_INPUT_OUTPUT,
screen->root_visual, screen->root_visual,

3
emul/hw/ti/Makefile
View File

@ -2,12 +2,13 @@ EXTOBJS = ../../emul.o ../../libz80/libz80.o
OBJS = ti84.o t6a04.o kbd.o OBJS = ti84.o t6a04.o kbd.o
TARGET = ti84 TARGET = ti84
CFLAGS += `pkg-config --cflags xcb` CFLAGS += `pkg-config --cflags xcb`
LDFLAGS += `pkg-config --libs xcb`
.PHONY: all .PHONY: all
all: $(TARGET) all: $(TARGET)
$(TARGET): $(OBJS) $(EXTOBJS) $(TARGET): $(OBJS) $(EXTOBJS)
$(CC) `pkg-config --libs xcb` $(OBJS) $(EXTOBJS) -o $@ $(CC) $(OBJS) $(EXTOBJS) -o $@ $(LDFLAGS)
.PHONY: clean .PHONY: clean
clean: clean:

2
emul/hw/ti/ti84.c
View File

@ -160,7 +160,7 @@ void create_window()
win, win,
screen->root, screen->root,
0, 0, 0, 0,
150, 150, 500, 500,
10, 10,
XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_WINDOW_CLASS_INPUT_OUTPUT,
screen->root_visual, screen->root_visual,