mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-01-17 02:58:07 +00:00
Merge remote-tracking branch 'bc/master' into tunnel
Conflicts: linphone.xcodeproj/project.pbxproj submodules/build/Makefile
This commit is contained in:
Jehan Monnier
commit
1f687ef981
10 changed files with 44 additions and 32 deletions
|
|
@ -161,6 +161,8 @@
|
|||
<dict>
|
||||
<key>Title</key>
|
||||
<string>Tunnel</string>
|
||||
<key>Type</key>
|
||||
<string>PSGroupSpecifier</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>Type</key>
|
||||
|
|
|
|||
|
|
@ -29,6 +29,11 @@ clean:
|
|||
&& make -f builder-iphone-os.mk clean clean-tunnel\
|
||||
&& make -f builder-iphone-os.mk host=armv7-apple-darwin clean clean-tunnel
|
||||
clean-makefile:
|
||||
make -f builder-iphone-simulator.mk clean-makefile clean-makefile-tunnel\
|
||||
&& make -f builder-iphone-os.mk clean-makefile clean-makefile-tunnel\
|
||||
&& make -f builder-iphone-os.mk host=armv7-apple-darwin clean-makefile clean-makefile-tunnel
|
||||
make -f builder-iphone-simulator.mk clean-makefile \
|
||||
&& make -f builder-iphone-os.mk clean-makefile \
|
||||
&& make -f builder-iphone-os.mk host=armv7-apple-darwin clean-makefile
|
||||
|
||||
veryclean:
|
||||
make -f builder-iphone-simulator.mk veryclean veryclean-tunnel\
|
||||
&& make -f builder-iphone-os.mk veryclean veryclean-tunnel\
|
||||
&& make -f builder-iphone-os.mk host=armv7-apple-darwin veryclean veryclean-tunnel
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ init:
|
|||
mkdir -p $(prefix)/include
|
||||
mkdir -p $(prefix)/lib
|
||||
|
||||
veryclean:
|
||||
veryclean: veryclean-linphone
|
||||
rm -rf $(BUILDER_BUILD_DIR)
|
||||
|
||||
.NOTPARALLEL build-linphone: init build-openssl build-osip2 build-eXosip2 build-speex build-libgsm $(LINPHONE_BUILD_DIR)/Makefile
|
||||
|
|
@ -86,9 +86,9 @@ veryclean:
|
|||
clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm clean-msilbc clean-libilbc clean-openssl clean-msamr
|
||||
cd $(LINPHONE_BUILD_DIR) && make clean
|
||||
|
||||
veryclean-linphone: clean-linphone veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr
|
||||
cd $(LINPHONE_BUILD_DIR) && make distclean
|
||||
cd $(LINPHONE_SRC_DIR) && rm -f configure
|
||||
veryclean-linphone: veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr
|
||||
#-cd $(LINPHONE_BUILD_DIR) && make distclean
|
||||
-cd $(LINPHONE_SRC_DIR) && rm -f configure
|
||||
|
||||
clean-makefile-linphone: clean-makefile-osip2 clean-makefile-eXosip2 clean-makefile-speex clean-makefile-libilbc clean-makefile-msilbc clean-makefile-openssl clean-makefile-msamr
|
||||
cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile
|
||||
|
|
@ -132,8 +132,8 @@ clean-osip2:
|
|||
cd $(BUILDER_BUILD_DIR)/$(osip_dir) && make clean
|
||||
|
||||
veryclean-osip2:
|
||||
cd $(BUILDER_BUILD_DIR)/$(osip_dir) && make distclean
|
||||
cd $(BUILDER_SRC_DIR)/$(osip_dir) && rm -f configure
|
||||
# -cd $(BUILDER_BUILD_DIR)/$(osip_dir) && make distclean
|
||||
-cd $(BUILDER_SRC_DIR)/$(osip_dir) && rm -f configure
|
||||
|
||||
clean-makefile-osip2:
|
||||
cd $(BUILDER_BUILD_DIR)/$(osip_dir) && rm -f Makefile
|
||||
|
|
@ -157,7 +157,8 @@ clean-eXosip2:
|
|||
cd $(BUILDER_BUILD_DIR)/$(eXosip_dir) && make clean
|
||||
|
||||
veryclean-eXosip2:
|
||||
cd $(BUILDER_BUILD_DIR)/$(eXosip_dir) && make distclean
|
||||
# -cd $(BUILDER_BUILD_DIR)/$(eXosip_dir) && make distclean
|
||||
-rm -f $(BUILDER_SRC_DIR)/$(eXosip_dir)/configure
|
||||
|
||||
clean-makefile-eXosip2:
|
||||
cd $(BUILDER_BUILD_DIR)/$(eXosip_dir) && rm -f Makefile
|
||||
|
|
@ -181,7 +182,8 @@ clean-speex:
|
|||
cd $(BUILDER_BUILD_DIR)/$(speex_dir) && make clean
|
||||
|
||||
veryclean-speex:
|
||||
cd $(BUILDER_BUILD_DIR)/$(speex_dir) && make distclean
|
||||
# -cd $(BUILDER_BUILD_DIR)/$(speex_dir) && make distclean
|
||||
-rm -f $(BUILDER_SRC_DIR)/$(speex_dir)/configure
|
||||
|
||||
clean-makefile-speex:
|
||||
cd $(BUILDER_BUILD_DIR)/$(speex_dir) && rm -f Makefile
|
||||
|
|
@ -201,8 +203,8 @@ clean-libgsm:
|
|||
cd $(BUILDER_BUILD_DIR)/$(gsm_dir)\
|
||||
&& make clean
|
||||
|
||||
veryclean-libgsm: clean-libgsm
|
||||
cd $(BUILDER_BUILD_DIR)/$(gsm_dir)) \
|
||||
veryclean-libgsm:
|
||||
-cd $(BUILDER_BUILD_DIR)/$(gsm_dir) \
|
||||
&& make uninstall
|
||||
|
||||
|
||||
|
|
@ -225,8 +227,8 @@ clean-msilbc:
|
|||
cd $(MSILBC_BUILD_DIR) && make clean
|
||||
|
||||
veryclean-msilbc:
|
||||
cd $(MSILBC_BUILD_DIR) && make distclean
|
||||
cd $(MSILBC_BUILD_DIR) && rm configure
|
||||
# -cd $(MSILBC_BUILD_DIR) && make distclean
|
||||
-cd $(MSILBC_SRC_DIR) && rm configure
|
||||
|
||||
clean-makefile-msilbc:
|
||||
cd $(MSILBC_BUILD_DIR) && rm -f Makefile
|
||||
|
|
@ -249,8 +251,8 @@ clean-libilbc:
|
|||
cd $(LIBILBC_BUILD_DIR) && make clean
|
||||
|
||||
veryclean-libilbc:
|
||||
cd $(LIBILBC_BUILD_DIR) && make distclean
|
||||
cd $(LIBILBC_BUILD_DIR) && rm -f configure
|
||||
# -cd $(LIBILBC_BUILD_DIR) && make distclean
|
||||
-cd $(MSILBC_SRC_DIR) && rm -f configure
|
||||
|
||||
clean-makefile-libilbc:
|
||||
cd $(LIBILBC_BUILD_DIR) && rm -f Makefile
|
||||
|
|
|
|||
|
|
@ -36,7 +36,8 @@ clean-msamr: clean-opencore-amr
|
|||
cd $(BUILDER_BUILD_DIR)/$(msamr_dir) && make clean
|
||||
|
||||
veryclean-msamr: veryclean-opencore-amr
|
||||
cd $(BUILDER_BUILD_DIR)/$(msamr_dir) && make distclean && rm -f configure
|
||||
-cd $(BUILDER_BUILD_DIR)/$(msamr_dir) && make distclean
|
||||
rm -rf $(BUILDER_BUILD_DIR)/$(msamr_dir)
|
||||
|
||||
clean-makefile-msamr: clean-makefile-opencore-amr
|
||||
cd $(BUILDER_BUILD_DIR)/$(msamr_dir) && rm -f Makefile
|
||||
|
|
|
|||
|
|
@ -37,8 +37,8 @@ clean-opencore-amr:
|
|||
cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && make clean
|
||||
|
||||
veryclean-opencore-amr:
|
||||
cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && make distclean
|
||||
cd $(BUILDER_SRC_DIR)/$(opencore-amr_dir) && rm -f configure
|
||||
-cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && make distclean
|
||||
-rm -rf $(BUILDER_BUILD_DIR)/$(opencore-amr_dir)
|
||||
|
||||
clean-makefile-opencore-amr:
|
||||
cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && rm -f Makefile
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ clean-tunnel:
|
|||
cd $(TUNNEL_BUILD_DIR) && make clean
|
||||
|
||||
veryclean-tunnel:
|
||||
cd $(TUNNEL_BUILD_DIR) && make distclean
|
||||
rm -f $(TUNNEL_SRC_DIR)/configure
|
||||
|
||||
clean-makefile-tunnel:
|
||||
cd $(TUNNEL_BUILD_DIR) && rm -f Makefile
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 2f7640d571fa12f75d269eda59d91e2037f99c5d
|
||||
Subproject commit 8af11e23e482c98a40e5661c16974b297a0d0396
|
||||
|
|
@ -954,12 +954,12 @@
|
|||
GCC_C_LANGUAGE_STANDARD = c99;
|
||||
GCC_OPTIMIZATION_LEVEL = 0;
|
||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||
"_BYTE_ORDER=_LITTLE_ENDIAN\n",
|
||||
"_BYTE_ORDER=_LITTLE_ENDIAN",
|
||||
ORTP_INET6,
|
||||
ENABLE_TRACE,
|
||||
"LINPHONE_VERSION=\\\"Linphone-3.3.x\\\"",
|
||||
"LINPHONE_VERSION=\\\"debug\\\"",
|
||||
"LINPHONE_PLUGINS_DIR=\\\"\\\\tmp\\\"",
|
||||
"LOG_DOMAIN=\\\"Linphone\\\"\n",
|
||||
"LOG_DOMAIN=\\\"Linphone\\\"",
|
||||
"ORTP_MAJOR_VERSION=0",
|
||||
"ORTP_MICRO_VERSION=0",
|
||||
"ORTP_MINOR_VERSION=15",
|
||||
|
|
@ -969,6 +969,7 @@
|
|||
IN_LINPHONE,
|
||||
__MACIOUNIT_ENABLED__,
|
||||
HAVE_EXOSIP_GET_SOCKET,
|
||||
MS2_INTERNAL,
|
||||
);
|
||||
GCC_WARN_ABOUT_RETURN_TYPE = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
|
|
@ -984,7 +985,7 @@
|
|||
OTHER_LDFLAGS = "-ObjC";
|
||||
PREBINDING = NO;
|
||||
SDKROOT = iphoneos;
|
||||
VALID_ARCHS = "armv6 armv7";
|
||||
VALID_ARCHS = "armv6 armv7 i386";
|
||||
};
|
||||
name = Debug;
|
||||
};
|
||||
|
|
@ -994,12 +995,12 @@
|
|||
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
|
||||
GCC_C_LANGUAGE_STANDARD = c99;
|
||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||
"_BYTE_ORDER=_LITTLE_ENDIAN\n",
|
||||
"_BYTE_ORDER=_LITTLE_ENDIAN",
|
||||
ORTP_INET6,
|
||||
ENABLE_TRACE,
|
||||
"LINPHONE_VERSION=\\\"Linphone-3.3.x\\\"",
|
||||
"LINPHONE_VERSION=\\\"debug\\\"",
|
||||
"LINPHONE_PLUGINS_DIR=\\\"\\\\tmp\\\"",
|
||||
"LOG_DOMAIN=\\\"Linphone\\\"\n",
|
||||
"LOG_DOMAIN=\\\"Linphone\\\"",
|
||||
"ORTP_MAJOR_VERSION=0",
|
||||
"ORTP_MICRO_VERSION=0",
|
||||
"ORTP_MINOR_VERSION=15",
|
||||
|
|
@ -1009,6 +1010,7 @@
|
|||
IN_LINPHONE,
|
||||
__MACIOUNIT_ENABLED__,
|
||||
HAVE_EXOSIP_GET_SOCKET,
|
||||
MS2_INTERNAL,
|
||||
);
|
||||
GCC_WARN_ABOUT_RETURN_TYPE = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
|
|
@ -1024,7 +1026,7 @@
|
|||
OTHER_LDFLAGS = "-ObjC";
|
||||
PREBINDING = NO;
|
||||
SDKROOT = iphoneos;
|
||||
VALID_ARCHS = "armv6 armv7";
|
||||
VALID_ARCHS = "armv6 armv7 i386";
|
||||
};
|
||||
name = Release;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 9a2914c429330ef06fadecd6691fccf55e3ade0a
|
||||
Subproject commit 8ba552ab693cb648947defac468cd31c311dbad3
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit c171257982274d1947bd4333b12918cdb2e8280e
|
||||
Subproject commit 37968787d92eb67457b9e5e9197451b9b0765461
|
||||
Loading…
Add table
Reference in a new issue