mirror/bsnes
1
0
Fork 0
mirror of https://github.com/bsnes-emu/bsnes.git synced 2025-09-02 14:12:45 +02:00
Code Issues Projects Releases Wiki Activity

Fixed windows cmd build (LIB overrides msvc-clang/clang-cl libpath.)

Browse Source
This commit is contained in:
Roy Merkel
2024-04-13 09:24:19 -07:00
parent 5d06f45c0f
commit 2ea0932726
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -100,7 +100,7 @@ CONF ?= debug
BIN := build/bin BIN := build/bin
OBJ := build/obj OBJ := build/obj
INC := build/include/sameboy INC := build/include/sameboy
LIB := build/lib LIBDIR := build/lib
BOOTROMS_DIR ?= $(BIN)/BootROMs BOOTROMS_DIR ?= $(BIN)/BootROMs
@@ -331,7 +331,7 @@ ios-deb: $(BIN)/SameBoy-iOS.deb
ifeq ($(PLATFORM),windows32) ifeq ($(PLATFORM),windows32)
lib: lib-unsupported lib: lib-unsupported
else else
lib: $(LIB)/libsameboy.o $(LIB)/libsameboy.a lib: $(LIBDIR)/libsameboy.o $(LIBDIR)/libsameboy.a
endif endif
all: sdl tester libretro lib all: sdl tester libretro lib
ifeq ($(PLATFORM),Darwin) ifeq ($(PLATFORM),Darwin)
@@ -717,7 +717,7 @@ $(OBJ)/debian-binary:
-@$(MKDIR) -p $(dir $@) -@$(MKDIR) -p $(dir $@)
echo 2.0 > $@ echo 2.0 > $@
$(LIB)/libsameboy.o: $(CORE_OBJECTS) $(LIBDIR)/libsameboy.o: $(CORE_OBJECTS)
-@$(MKDIR) -p $(dir $@) -@$(MKDIR) -p $(dir $@)
@# This is a somewhat simple hack to force Clang and GCC to build a native object file out of one or many LTO objects @# This is a somewhat simple hack to force Clang and GCC to build a native object file out of one or many LTO objects
echo "static const char __attribute__((used)) x=0;"| $(CC) $(filter-out -flto,$(CFLAGS)) -c -x c - -o $(OBJ)/lto_hack.o echo "static const char __attribute__((used)) x=0;"| $(CC) $(filter-out -flto,$(CFLAGS)) -c -x c - -o $(OBJ)/lto_hack.o
@@ -725,7 +725,7 @@ $(LIB)/libsameboy.o: $(CORE_OBJECTS)
$(CC) $(FAT_FLAGS) $(CFLAGS) $(LIBFLAGS) $^ $(OBJ)/lto_hack.o -o $@ $(CC) $(FAT_FLAGS) $(CFLAGS) $(LIBFLAGS) $^ $(OBJ)/lto_hack.o -o $@
-@rm $(OBJ)/lto_hack.o -@rm $(OBJ)/lto_hack.o
$(LIB)/libsameboy.a: $(LIB)/libsameboy.o $(LIBDIR)/libsameboy.a: $(LIBDIR)/libsameboy.o
-@$(MKDIR) -p $(dir $@) -@$(MKDIR) -p $(dir $@)
-@rm -f $@ -@rm -f $@
ar -crs $@ $^ ar -crs $@ $^