Apple-2-Tools/gsport
1
0
Fork 0
mirror of https://github.com/david-schmidt/gsport.git synced 2024-06-09 18:29:29 +00:00
Code Issues Projects Releases Wiki Activity

Compile C source files with the C compiler rather than the C++ compiler.

Browse Source
This commit is contained in:
Peter 2014-04-23 15:36:50 +00:00
parent 58cc512bc9
commit ab27b61d1c
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Makefile
View File

@ -20,13 +20,13 @@ PERL = perl
all: $(TARGET) all: $(TARGET)
clean: clean:
- rm $(OBJECTS) - rm -f $(OBJECTS)
- rm $(TARGET) - rm -f $(TARGET)
- rm compile_time.o - rm -f compile_time.o
- rm 8inst_c.h - rm -f 8inst_c.h
- rm 16inst_c.h - rm -f 16inst_c.h
- rm -r ../GSport.app - rm -rf ../GSport.app
- rm -r ../GSportDmg - rm -rf ../GSportDmg
specials: 8inst_s 16inst_s 8size 16size 8inst_c 16inst_c size_c size_s 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: # Linux for X builds:
gsportx: $(OBJECTS) compile_time.o 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) echo $(OBJECTS)
mv gsportx .. mv gsportx ..
cp -f ../config.template ../config.txt cp -f ../config.template ../config.txt
# Linux framebuffer builds: # Linux framebuffer builds:
gsportfb: $(OBJECTS) compile_time.o 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) echo $(OBJECTS)
mv gsportfb .. mv gsportfb ..
cp -f ../config.template ../config.txt cp -f ../config.template ../config.txt

4
src/vars_fbrpilinux
View File

@ -1,13 +1,13 @@
TARGET = gsportfb TARGET = gsportfb
OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(TFEOBJ) fbdriver.o OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(TFEOBJ) fbdriver.o
CC = g++ CC = gcc
CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -march=armv6 CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -march=armv6
OPTS = -DGSPORT_LITTLE_ENDIAN -DHAVE_TFE -DHAVE_ATBRIDGE OPTS = -DGSPORT_LITTLE_ENDIAN -DHAVE_TFE -DHAVE_ATBRIDGE
SUFFIX = SUFFIX =
NAME = gsportfb NAME = gsportfb
LDFLAGS = LDFLAGS =
LDOPTS = LDOPTS =
LD = $(CC) LD = g++
EXTRA_LIBS = EXTRA_LIBS =
EXTRA_SPECIALS = EXTRA_SPECIALS =

4
src/vars_pi
View File

@ -1,13 +1,13 @@
TARGET = gsportx TARGET = gsportx
OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) xdriver.o OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) xdriver.o
CC = g++ CC = gcc
CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -march=armv6 CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -march=armv6
OPTS = -DGSPORT_LITTLE_ENDIAN -DHAVE_TFE -DTOGGLE_STATUS -DHAVE_ATBRIDGE OPTS = -DGSPORT_LITTLE_ENDIAN -DHAVE_TFE -DTOGGLE_STATUS -DHAVE_ATBRIDGE
SUFFIX = SUFFIX =
NAME = gsportx NAME = gsportx
LDFLAGS = LDFLAGS =
LDOPTS = LDOPTS =
LD = $(CC) LD = g++
EXTRA_LIBS = -lXext EXTRA_LIBS = -lXext
EXTRA_SPECIALS = EXTRA_SPECIALS =

6
src/vars_x86linux
View File

@ -1,17 +1,17 @@
TARGET = gsportx TARGET = gsportx
OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) xdriver.o 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 CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -march=i686 -DHAVE_TFE -DHAVE_ATBRIDGE -DTOGGLE_STATUS
OPTS = -DGSPORT_LITTLE_ENDIAN OPTS = -DGSPORT_LITTLE_ENDIAN
SUFFIX = SUFFIX =
NAME = gsportx NAME = gsportx
LDFLAGS = LDFLAGS =
LDOPTS = LDOPTS =
LD = $(CC) LD = g++
EXTRA_LIBS = -lXext EXTRA_LIBS = -lXext
EXTRA_SPECIALS = EXTRA_SPECIALS =
AS = cc AS = cc
PERL = perl PERL = perl
XOPTS = -I/usr/X11R6/include XOPTS = -I/usr/X11R6/include

8
src/xdriver.c
View File

@ -682,7 +682,7 @@ x_try_find_visual(int depth, int screen_num, XVisualInfo **visual_list_ptr)
(word32)visualList[i].visualid, (word32)visualList[i].visualid,
visualList[i].screen, visualList[i].screen,
visualList[i].depth, visualList[i].depth,
visualList[i].c_class); visualList[i].class);
printf(" red: %08lx, green: %08lx, blue: %08lx\n", printf(" red: %08lx, green: %08lx, blue: %08lx\n",
visualList[i].red_mask, visualList[i].red_mask,
visualList[i].green_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", printf(" cmap size: %d, bits_per_rgb: %d\n",
visualList[i].colormap_size, visualList[i].colormap_size,
visualList[i].bits_per_rgb); visualList[i].bits_per_rgb);
match8 = (visualList[i].c_class == PseudoColor); match8 = (visualList[i].class == PseudoColor);
match24 = (visualList[i].c_class == TrueColor); match24 = (visualList[i].class == TrueColor);
if((depth == 8) && match8) { if((depth == 8) && match8) {
visual_chosen = i; visual_chosen = i;
Max_color_size = visualList[i].colormap_size; Max_color_size = visualList[i].colormap_size;
@ -1127,7 +1127,7 @@ check_input_events()
(word32)(ev.xcolormap.window)); (word32)(ev.xcolormap.window));
vid_printf("colormap: %08x, new: %d, state: %d\n", vid_printf("colormap: %08x, new: %d, state: %d\n",
(word32)ev.xcolormap.colormap, (word32)ev.xcolormap.colormap,
ev.xcolormap.c_new, ev.xcolormap.state); ev.xcolormap.new, ev.xcolormap.state);
break; break;
case ClientMessage: case ClientMessage:
if (ev.xclient.data.l[0] == (long)WM_DELETE_WINDOW) if (ev.xclient.data.l[0] == (long)WM_DELETE_WINDOW)