projects / packages / fz-api.git / blame
| Commit | Line | Data |
|---|---|---|
| 2802a0ce JB |
1 | --- fz-linux-api_x64/fz_api_src/Makefile.orig 2013-09-25 11:56:53.000000000 +0200 |
| 2 | +++ fz-linux-api_x64/fz_api_src/Makefile 2014-07-24 21:20:32.086256112 +0200 | |
| 3 | @@ -16,7 +16,7 @@ | |
| 4 | COMPILERFLAGS = -Wall -g\r | |
| 5 | \r | |
| 6 | \r | |
| 7 | -LDFLAGS_PLAIN = -lpthread\r | |
| 8 | +LDFLAGS_PLAIN = -lyuv -lpthread\r | |
| 9 | EXE_PATH = ./\r | |
| 10 | \r | |
| 11 | ifeq ($(TARGET_OS),Darwin)\r | |
| 12 | @@ -24,13 +24,8 @@ | |
| 13 | LDFLAGS_D_OUT = -dynamiclib -o libfz_api.dylib\r | |
| 14 | else\r | |
| 15 | \r | |
| 16 | -ifeq ($(TARGET_ARCH),x86_64)\r | |
| 17 | -CFLAGS = -m64 -fPIC $(COMPILERFLAGS) -I./\r | |
| 18 | -LDFLAGS_D_OUT = -m64 -shared -Wl,-soname,libfz_api.so.1 -o libfz_api.so.1.0\r | |
| 19 | -else\r | |
| 20 | -CFLAGS = $(COMPILERFLAGS) -I./\r | |
| 21 | -LDFLAGS_D_OUT = -shared -Wl,-soname,libfz_api.so.1 -o libfz_api.so.1.0\r | |
| 22 | -endif\r | |
| 23 | +CFLAGS = -fPIC $(COMPILERFLAGS) -I./\r | |
| 24 | +LDFLAGS_D_OUT = $(LDFLAGS) -shared -Wl,-soname,libfz_api.so.1 -o libfz_api.so.1.0\r | |
| 25 | \r | |
| 26 | endif\r | |
| 27 | \r | |
| 28 | @@ -38,17 +33,7 @@ | |
| 29 | #objects\r | |
| 30 | \r | |
| 31 | API_OBJECTS = ./timer.o ./socket_2.o ./logger.o ./common.o \\r | |
| 32 | - ./fzapi_channel.o ./fzapi.o ./fz_ll.o ./stream.o ./libyuv/cpu_id.o \\r | |
| 33 | - ./libyuv/compare.o ./libyuv/compare_common.o ./libyuv/compare_neon.o \\r | |
| 34 | - ./libyuv/compare_posix.o ./libyuv/compare_win.o ./libyuv/convert.o \\r | |
| 35 | - ./libyuv/convert_argb.o ./libyuv/convert_from.o ./libyuv/convert_from_argb.o \\r | |
| 36 | - ./libyuv/format_conversion.o ./libyuv/mjpeg_decoder.o ./libyuv/planar_functions.o \\r | |
| 37 | - ./libyuv/rotate.o ./libyuv/rotate_argb.o ./libyuv/rotate_mips.o \\r | |
| 38 | - ./libyuv/rotate_neon.o ./libyuv/row_posix.o ./libyuv/row_win.o \\r | |
| 39 | - ./libyuv/scale.o ./libyuv/scale_argb.o \\r | |
| 40 | - ./libyuv/scale_argb_neon.o ./libyuv/scale_mips.o ./libyuv/scale_neon.o \\r | |
| 41 | - ./libyuv/video_common.o ./libyuv/row_any.o ./libyuv/row_common.o \\r | |
| 42 | - ./libyuv/row_mips.o ./libyuv/row_neon.o \r | |
| 43 | + ./fzapi_channel.o ./fzapi.o ./fz_ll.o ./stream.o\r | |
| 44 | \r | |
| 45 | \r | |
| 46 | #########\r | |
| 47 | @@ -65,7 +50,7 @@ | |
| 48 | @rm -f $*.d.tmp\r | |
| 49 | \r | |
| 50 | %.o: %.cc\r | |
| 51 | - g++ $(CFLAGS) -c $*.cc -o $*.o\r | |
| 52 | + $(CPP) $(CFLAGS) -c $*.cc -o $*.o\r | |
| 53 | \r | |
| 54 | %.o: %.c\r | |
| 55 | $(CC) $(CFLAGS) -c $*.c -o $*.o\r | |
| 56 | --- fz-linux-api_x64/fz_api_src/fzapi.cpp.orig 2014-07-24 21:21:37.052920053 +0200 | |
| 57 | +++ fz-linux-api_x64/fz_api_src/fzapi.cpp 2014-07-24 21:21:40.052919927 +0200 | |
| 58 | @@ -611,7 +611,7 @@ | |
| 59 | return iResult;\r | |
| 60 | }\r | |
| 61 | \r | |
| 62 | -#include <libyuv/libyuv.h>\r | |
| 63 | +#include <libyuv.h>\r | |
| 64 | \r | |
| 65 | FZ_API FZ_Result FZ_GetFrameARGB(\r | |
| 66 | FZ_Device_Handle_t hDev,\r |