Created
December 11, 2014 11:27
-
-
Save BtbN/b0e7a6fbc5e8189cf694 to your computer and use it in GitHub Desktop.
stdin
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/configure b/configure | |
index 9d04ee2..9c3cb42 100755 | |
--- a/configure | |
+++ b/configure | |
@@ -1847,6 +1847,7 @@ CONFIG_EXTRA=" | |
blockdsp | |
bswapdsp | |
cabac | |
+ cygwin | |
dvprofile | |
exif | |
faandct | |
@@ -4132,6 +4133,7 @@ case $target_os in | |
SLIB_INSTALL_EXTRA_LIB='lib$(FULLNAME).dll.a' | |
SHFLAGS='-shared -Wl,--out-implib,$(SUBDIR)lib$(FULLNAME).dll.a' | |
objformat="win32" | |
+ enable cygwin | |
enable dos_paths | |
enabled shared && ! enabled small && check_cmd $windres --version && enable gnu_windres | |
;; | |
diff --git a/libavcodec/Makefile b/libavcodec/Makefile | |
index 98bec64..5647d8a 100644 | |
--- a/libavcodec/Makefile | |
+++ b/libavcodec/Makefile | |
@@ -900,6 +900,10 @@ TRIG_TABLES := $(TRIG_TABLES:%=$(SUBDIR)%_tables.c) | |
$(TRIG_TABLES): $(SUBDIR)%_tables.c: $(SUBDIR)cos_tablegen$(HOSTEXESUF) | |
$(M)./$< $* > $@ | |
+ifdef CONFIG_CYGWIN | |
+$(SUBDIR)nvenc.o: CFLAGS += -mwin32 | |
+endif | |
+ | |
ifdef CONFIG_SMALL | |
$(SUBDIR)%_tablegen$(HOSTEXESUF): HOSTCFLAGS += -DCONFIG_SMALL=1 | |
else |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment