Skip to content

Commit 39a078f

Browse files
committed
added support for windows 10 long paths with mingw (gpac#1589)
1 parent 42c1f06 commit 39a078f

File tree

6 files changed

+23
-0
lines changed

6 files changed

+23
-0
lines changed

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,8 @@ ifneq ($(MP4BOX_STATIC),yes)
244244
$(INSTALL) -d "$(DESTDIR)$(prefix)/$(lib_dir)"
245245

246246
ifeq ($(CONFIG_WIN32),yes)
247+
$(INSTALL) -d "$(DESTDIR)$(prefix)/bin"
248+
247249
$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/libgpac.dll.a $(DESTDIR)$(prefix)/$(lib_dir)
248250
$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/libgpac.dll $(DESTDIR)$(prefix)/bin
249251
else

applications/gpac/Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ OBJS= main.o
4545

4646
SRCS := $(OBJS:.o=.c)
4747

48+
ifeq ($(CONFIG_WIN32),yes)
49+
OBJS+=$(SRC_PATH)/manifest.o
50+
endif
51+
52+
4853
all: $(PROG)
4954

5055
$(PROG): $(OBJS)

applications/mp4box/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ endif
6262

6363
SRCS := $(OBJS:.o=.c)
6464

65+
ifeq ($(CONFIG_WIN32),yes)
66+
OBJS+=$(SRC_PATH)/manifest.o
67+
endif
68+
6569
all: $(PROG)
6670

6771
$(PROG): $(OBJS)

applications/mp4client/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ endif
5858

5959
SRCS := $(OBJS:.o=.c)
6060

61+
ifeq ($(CONFIG_WIN32),yes)
62+
OBJS+=$(SRC_PATH)/manifest.o
63+
endif
64+
6165
all: $(PROG)
6266

6367
MP4Client$(EXE): $(OBJS)

configure

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3306,6 +3306,13 @@ echo ' @echo " CC $<"' >> config.mak
33063306
fi
33073307
echo ' $(CXX) $(CFLAGS) -c -o $@ $<' >> config.mak
33083308

3309+
echo '%.o: %.rc $(SRC_PATH)/manifest.xml' >> config.mak
3310+
if test "$verbose" = "no" ; then
3311+
echo ' @echo " RC $<"' >> config.mak
3312+
fi
3313+
echo ' $(WINDRES) $< -o $@ ' >> config.mak
3314+
3315+
33093316
#pkg-config
33103317
generate_pkgconfig () {
33113318
echo "prefix=$prefix"

manifest.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1 24 "build/msvc14/gpac_manifest.xml"

0 commit comments

Comments
 (0)