mirror of
https://github.com/david-schmidt/gsport.git
synced 2025-01-02 06:30:49 +00:00
Compile C source files with the C compiler rather than the C++ compiler.
This commit is contained in:
parent
58cc512bc9
commit
ab27b61d1c
18
src/Makefile
18
src/Makefile
@ -20,13 +20,13 @@ PERL = perl
|
||||
all: $(TARGET)
|
||||
|
||||
clean:
|
||||
- rm $(OBJECTS)
|
||||
- rm $(TARGET)
|
||||
- rm compile_time.o
|
||||
- rm 8inst_c.h
|
||||
- rm 16inst_c.h
|
||||
- rm -r ../GSport.app
|
||||
- rm -r ../GSportDmg
|
||||
- rm -f $(OBJECTS)
|
||||
- rm -f $(TARGET)
|
||||
- rm -f compile_time.o
|
||||
- rm -f 8inst_c.h
|
||||
- rm -f 16inst_c.h
|
||||
- rm -rf ../GSport.app
|
||||
- rm -rf ../GSportDmg
|
||||
|
||||
specials: 8inst_s 16inst_s 8size 16size 8inst_c 16inst_c size_c size_s
|
||||
|
||||
@ -62,14 +62,14 @@ gsportmac: $(OBJECTS) compile_time.o
|
||||
|
||||
# Linux for X builds:
|
||||
gsportx: $(OBJECTS) compile_time.o
|
||||
$(CC) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(XLIBS) $(EXTRA_LIBS) -lX11
|
||||
$(LD) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(XLIBS) $(EXTRA_LIBS) -lX11
|
||||
echo $(OBJECTS)
|
||||
mv gsportx ..
|
||||
cp -f ../config.template ../config.txt
|
||||
|
||||
# Linux framebuffer builds:
|
||||
gsportfb: $(OBJECTS) compile_time.o
|
||||
$(CC) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(EXTRA_LIBS)
|
||||
$(LD) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(EXTRA_LIBS)
|
||||
echo $(OBJECTS)
|
||||
mv gsportfb ..
|
||||
cp -f ../config.template ../config.txt
|
||||
|
@ -1,13 +1,13 @@
|
||||
TARGET = gsportfb
|
||||
OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(TFEOBJ) fbdriver.o
|
||||
CC = g++
|
||||
CC = gcc
|
||||
CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -march=armv6
|
||||
OPTS = -DGSPORT_LITTLE_ENDIAN -DHAVE_TFE -DHAVE_ATBRIDGE
|
||||
SUFFIX =
|
||||
NAME = gsportfb
|
||||
LDFLAGS =
|
||||
LDOPTS =
|
||||
LD = $(CC)
|
||||
LD = g++
|
||||
EXTRA_LIBS =
|
||||
EXTRA_SPECIALS =
|
||||
|
||||
|
@ -1,13 +1,13 @@
|
||||
TARGET = gsportx
|
||||
OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) xdriver.o
|
||||
CC = g++
|
||||
CC = gcc
|
||||
CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -march=armv6
|
||||
OPTS = -DGSPORT_LITTLE_ENDIAN -DHAVE_TFE -DTOGGLE_STATUS -DHAVE_ATBRIDGE
|
||||
SUFFIX =
|
||||
NAME = gsportx
|
||||
LDFLAGS =
|
||||
LDOPTS =
|
||||
LD = $(CC)
|
||||
LD = g++
|
||||
EXTRA_LIBS = -lXext
|
||||
EXTRA_SPECIALS =
|
||||
|
||||
|
@ -1,17 +1,17 @@
|
||||
TARGET = gsportx
|
||||
OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) xdriver.o
|
||||
CC = g++
|
||||
CC = gcc
|
||||
CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -march=i686 -DHAVE_TFE -DHAVE_ATBRIDGE -DTOGGLE_STATUS
|
||||
OPTS = -DGSPORT_LITTLE_ENDIAN
|
||||
SUFFIX =
|
||||
NAME = gsportx
|
||||
LDFLAGS =
|
||||
LDOPTS =
|
||||
LD = $(CC)
|
||||
LD = g++
|
||||
EXTRA_LIBS = -lXext
|
||||
EXTRA_SPECIALS =
|
||||
|
||||
AS = cc
|
||||
PERL = perl
|
||||
|
||||
XOPTS = -I/usr/X11R6/include
|
||||
XOPTS = -I/usr/X11R6/include
|
||||
|
@ -682,7 +682,7 @@ x_try_find_visual(int depth, int screen_num, XVisualInfo **visual_list_ptr)
|
||||
(word32)visualList[i].visualid,
|
||||
visualList[i].screen,
|
||||
visualList[i].depth,
|
||||
visualList[i].c_class);
|
||||
visualList[i].class);
|
||||
printf(" red: %08lx, green: %08lx, blue: %08lx\n",
|
||||
visualList[i].red_mask,
|
||||
visualList[i].green_mask,
|
||||
@ -690,8 +690,8 @@ x_try_find_visual(int depth, int screen_num, XVisualInfo **visual_list_ptr)
|
||||
printf(" cmap size: %d, bits_per_rgb: %d\n",
|
||||
visualList[i].colormap_size,
|
||||
visualList[i].bits_per_rgb);
|
||||
match8 = (visualList[i].c_class == PseudoColor);
|
||||
match24 = (visualList[i].c_class == TrueColor);
|
||||
match8 = (visualList[i].class == PseudoColor);
|
||||
match24 = (visualList[i].class == TrueColor);
|
||||
if((depth == 8) && match8) {
|
||||
visual_chosen = i;
|
||||
Max_color_size = visualList[i].colormap_size;
|
||||
@ -1127,7 +1127,7 @@ check_input_events()
|
||||
(word32)(ev.xcolormap.window));
|
||||
vid_printf("colormap: %08x, new: %d, state: %d\n",
|
||||
(word32)ev.xcolormap.colormap,
|
||||
ev.xcolormap.c_new, ev.xcolormap.state);
|
||||
ev.xcolormap.new, ev.xcolormap.state);
|
||||
break;
|
||||
case ClientMessage:
|
||||
if (ev.xclient.data.l[0] == (long)WM_DELETE_WINDOW)
|
||||
|
Loading…
Reference in New Issue
Block a user