Skip to content

Commit

Permalink
make: address a ci race
Browse files Browse the repository at this point in the history
would be better to drop the plugins really
  • Loading branch information
notaz committed Jan 25, 2025
1 parent 16b099b commit ddab615
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 15 deletions.
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,10 @@ clean: $(PLAT_CLEAN) clean_plugins
ifneq ($(PLUGINS),)
plugins_: $(PLUGINS)

$(PLUGINS):
plugins/gpulib/gpulib.$(ARCH).a:
$(MAKE) -C plugins/gpulib/

$(PLUGINS): plugins/gpulib/gpulib.$(ARCH).a
$(MAKE) -C $(dir $@)

clean_plugins:
Expand Down
8 changes: 1 addition & 7 deletions plugins/gpulib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,16 @@ include ../../config.mak

OBJS += gpu.o prim.o

ifeq "$(ARCH)" "arm"
OBJS += vout_pl.o
EXT = a
else
#CFLAGS += `sdl-config --cflags`
#OBJS += vout_sdl.o
OBJS += vout_pl.o
EXT = $(ARCH).a
endif
CFLAGS += $(PLUGIN_CFLAGS)

# need to compile to another dir, same files are compiled
# into main binary without PIC
OBJS2 = $(patsubst %.o,obj/%.o,$(OBJS))

TARGET = gpulib.$(EXT)
TARGET = gpulib.$(ARCH).a

all: ../../config.mak obj $(TARGET)

Expand Down
9 changes: 2 additions & 7 deletions plugins/gpulib/gpulib.mak
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,12 @@

LDFLAGS += -shared -Wl,--no-undefined
CFLAGS += $(PLUGIN_CFLAGS)
ifeq "$(ARCH)" "arm"
EXT =
else
#LDLIBS_GPULIB += `sdl-config --libs`
EXT = .$(ARCH)
endif
#LDLIBS_GPULIB += `sdl-config --libs`
ifdef DEBUG
CFLAGS += -O0
endif

GPULIB_A = ../gpulib/gpulib$(EXT).a
GPULIB_A = ../gpulib/gpulib.$(ARCH).a

ifdef BIN_STANDALONE
TARGETS += $(BIN_STANDALONE)
Expand Down

0 comments on commit ddab615

Please sign in to comment.