Skip to content

Commit

Permalink
fix live555 versioning
Browse files Browse the repository at this point in the history
  • Loading branch information
“Lu-Fi” committed Sep 21, 2024
1 parent cbb69a3 commit 2538587
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 49 deletions.
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ deps() {
./genMakefiles prudynt-static
else
echo "SHARED LIVE555"
cp ../../res/live555-config.prudynt ./config.prudynt
patch config.linux-with-shared-libraries ../../res/live555-prudynt.patch --output=./config.prudynt
./genMakefiles prudynt
fi

Expand Down
48 changes: 0 additions & 48 deletions res/live555-config.prudynt

This file was deleted.

35 changes: 35 additions & 0 deletions res/live555-prudynt.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
--- config.linux-with-shared-libraries 2024-09-20 07:18:24.000000000 +0000
@@ -24,23 +24,25 @@
libgroupsock_LIB_SUFFIX=so.$(shell expr $(libgroupsock_VERSION_CURRENT) - $(libgroupsock_VERSION_AGE)).$(libgroupsock_VERSION_AGE).$(libgroupsock_VERSION_REVISION)
#####

-COMPILE_OPTS = $(INCLUDES) -I/usr/local/include -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -fPIC
+CROSS_COMPILE= $(PRUDYNT_CROSS)
+COMPILE_OPTS = $(INCLUDES) -L$(PRUDYNT_ROOT)/3rdparty/install/lib/ -I$(PRUDYNT_ROOT)/3rdparty/install/include -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DNEWLOCALE_NOT_USED -DNO_OPENSSL=1 -DALLOW_RTSP_SERVER_PORT_REUSE=1 -fPIC -std=c++20
+PREFIX = $(PRUDYNT_ROOT)/3rdparty/install/
C = c
-C_COMPILER = $(CC)
+C_COMPILER = $(CROSS_COMPILE)gcc
C_FLAGS = $(COMPILE_OPTS) $(CPPFLAGS) $(CFLAGS)
CPP = cpp
-CPLUSPLUS_COMPILER = $(CXX)
+CPLUSPLUS_COMPILER = $(CROSS_COMPILE)g++
CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall -DBSD=1 $(CPPFLAGS) $(CXXFLAGS)
OBJ = o
-LINK = $(CXX) -o
+LINK = $(CROSS_COMPILE)g++ -o
LINK_OPTS = -L. $(LDFLAGS)
CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = $(CC) -o
+LIBRARY_LINK = $(CROSS_COMPILE)gcc -o
+LIBRARY_LINK_OPTS =
SHORT_LIB_SUFFIX = so.$(shell expr $($(NAME)_VERSION_CURRENT) - $($(NAME)_VERSION_AGE))
-LIB_SUFFIX = $(SHORT_LIB_SUFFIX).$($(NAME)_VERSION_AGE).$($(NAME)_VERSION_REVISION)
+LIB_SUFFIX = $(SHORT_LIB_SUFFIX).$($(NAME)_VERSION_AGE).$($(NAME)_VERSION_REVISION)
LIBRARY_LINK_OPTS = -shared -Wl,-soname,$(NAME).$(SHORT_LIB_SUFFIX) $(LDFLAGS)
-LIBS_FOR_CONSOLE_APPLICATION = -lssl -lcrypto
+LIBS_FOR_CONSOLE_APPLICATION = -L$(PRUDYNT_ROOT)/3rdparty/install/lib/
LIBS_FOR_GUI_APPLICATION =
-LIBS_FOR_LIVEMEDIA_LIB = -lssl -lcrypto
EXE =
INSTALL2 = install_shared_libraries

0 comments on commit 2538587

Please sign in to comment.