Skip to content

gl_client: fcommon,(prelim) custom CC support, multiple definitions error fix on GCC11+ #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DaniAsh551 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

gl_client: fcommon,(prelim) custom CC support, multiple definitions error fix on GCC11+ #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
166412c
feat(make):fcommon,custom CC
DaniAsh551 Jun 15, 2022
ac531f0
fix(utils):multiple definitions error on GCC11+
DaniAsh551 Jun 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions common/utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ ANativeWindow* glsurfaceview_window;
#include <X11/Xlib.h>
#include <X11/Xutil.h>

Display *xDisplay;
int xScreenId;
static Display *xDisplay;
static int xScreenId;
#if defined(GLS_SERVER) || !defined(USE_SERVER_SIZE)
Window xWindow;
static Window xWindow;
#endif // GLS_SERVER || !USE_SERVER_SIZE

#endif // USE_X11

#ifdef GLS_SERVER
int glsurfaceview_width;
int glsurfaceview_height;
static int glsurfaceview_width;
static int glsurfaceview_height;

int var_server_port;
int var_client_port;
static int var_server_port;
static int var_client_port;
const char* var_client_addr;
/*
const char* var_path_shadercache;
Expand Down
15 changes: 8 additions & 7 deletions gl_client/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
CFLAGS=-O3 -Wall -I../common -I. -I./include -fPIC -g
CC ?= gcc
CFLAGS=-O3 -Wall -I../common -I. -I./include -fPIC -g -fcommon -L/usr/include

# Use X11
CFLAGS+=-DUSE_X11
Expand All @@ -22,22 +23,22 @@ EXES=$(LIB_GLES)
all: $(EXES)

fifo.o: ../common/fifo.c ../common/fifo.h
gcc -c -o fifo.o $(CFLAGS) ../common/fifo.c
$(CC) -c -o fifo.o $(CFLAGS) ../common/fifo.c

server.o: ../common/server.c ../common/server.h fifo.o
gcc -c -o server.o $(CFLAGS) ../common/server.c
$(CC) -c -o server.o $(CFLAGS) ../common/server.c

clientegl.o: clientegl.c include/EGL/egl.h
gcc -c -o clientegl.o $(CFLAGS) clientegl.c
$(CC) -c -o clientegl.o $(CFLAGS) clientegl.c

clientgles.o: clientgles.c include/GLES2/gl2.h
gcc -c -o clientgles.o $(CFLAGS) clientgles.c
$(CC) -c -o clientgles.o $(CFLAGS) clientgles.c

glclient.o: glclient.c glclient.h ../common/gls_command.h server.o
gcc -c -o glclient.o $(CFLAGS) glclient.c
$(CC) -c -o glclient.o $(CFLAGS) glclient.c

$(LIB_GLES): $(OBJS)
gcc -shared -o $(LIB_GLES) $(CFLAGS) $(OBJS) -Wl,-init,gls_init_library,--no-undefined $(LIBS)
$(CC) -shared -o $(LIB_GLES) $(CFLAGS) $(OBJS) -Wl,-init,gls_init_library,--no-undefined $(LIBS)

install:
mkdir -p $(GLS_LIB_DIR)
Expand Down