![(please configure the [header_logo] section in trac.ini)](/repos/chrome/site/pj.jpg)
Changeset 1699
- Timestamp:
- Jan 17, 2008 7:17:33 PM (16 years ago)
- Location:
- pjproject/branches/users/nanang
- Files:
-
- 1 added
- 6 edited
-
pjmedia/build/pjmedia.dsp (modified) (4 diffs)
-
pjproject.dsw (modified) (4 diffs)
-
third_party/build/srtp (modified) (1 prop)
-
third_party/build/srtp/config.h (modified) (1 diff)
-
third_party/build/srtp/libsrtp.dsp (added)
-
third_party/build/srtp/libsrtp.vcproj (modified) (1 diff)
-
third_party/srtp/srtp/srtp.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
pjproject/branches/users/nanang/pjmedia/build/pjmedia.dsp
r1664 r1699 43 43 F90=df.exe 44 44 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c 45 # ADD CPP /nologo /MD /W4 /GX /Zi /O2 /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjnath/include" /I "../../third_party/portaudio/include" /I "../../third_party/speex/include" /I "../.. " /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /c45 # ADD CPP /nologo /MD /W4 /GX /Zi /O2 /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjnath/include" /I "../../third_party/portaudio/include" /I "../../third_party/speex/include" /I "../../third_party/build/srtp" /I "../../third_party/srtp/crypto/include" /I "../../third_party/srtp/include" /I "../.." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /c 46 46 # SUBTRACT CPP /YX 47 47 # ADD BASE RSC /l 0x409 /d "NDEBUG" … … 68 68 F90=df.exe 69 69 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c 70 # ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjnath/include" /I "../../third_party/portaudio/include" /I "../../third_party/speex/include" /I "../.. " /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /GZ /c70 # ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjnath/include" /I "../../third_party/portaudio/include" /I "../../third_party/speex/include" /I "../../third_party/build/srtp" /I "../../third_party/srtp/crypto/include" /I "../../third_party/srtp/include" /I "../.." /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /GZ /c 71 71 # SUBTRACT CPP /YX 72 72 # ADD BASE RSC /l 0x409 /d "_DEBUG" … … 250 250 # Begin Source File 251 251 252 SOURCE=..\src\pjmedia\transport_srtp.c 253 # End Source File 254 # Begin Source File 255 252 256 SOURCE=..\src\pjmedia\transport_udp.c 253 257 # End Source File … … 407 411 408 412 SOURCE=..\include\pjmedia\transport_ice.h 413 # End Source File 414 # Begin Source File 415 416 SOURCE=..\include\pjmedia\transport_srtp.h 409 417 # End Source File 410 418 # Begin Source File -
pjproject/branches/users/nanang/pjproject.dsw
r1488 r1699 4 4 ############################################################################### 5 5 6 Project: "libgsmcodec"=.\THIRD_PARTY\BUILD\GSM\libgsmcodec.dsp - Package Owner=<4> 7 8 Package=<5> 9 {{{ 10 }}} 11 12 Package=<4> 13 {{{ 14 }}} 15 16 ############################################################################### 17 18 Project: "libilbccodec"=.\THIRD_PARTY\BUILD\ILBC\libilbccodec.dsp - Package Owner=<4> 19 20 Package=<5> 21 {{{ 22 }}} 23 24 Package=<4> 25 {{{ 26 }}} 27 28 ############################################################################### 29 30 Project: "libmilenage"=.\third_party\build\milenage\libmilenage.dsp - Package Owner=<4> 31 32 Package=<5> 33 {{{ 34 }}} 35 36 Package=<4> 37 {{{ 38 }}} 39 40 ############################################################################### 41 42 Project: "libportaudio"=.\THIRD_PARTY\BUILD\PORTAUDIO\libportaudio.dsp - Package Owner=<4> 43 44 Package=<5> 45 {{{ 46 }}} 47 48 Package=<4> 49 {{{ 50 }}} 51 52 ############################################################################### 53 54 Project: "libresample"=.\THIRD_PARTY\BUILD\RESAMPLE\libresample.dsp - Package Owner=<4> 55 56 Package=<5> 57 {{{ 58 }}} 59 60 Package=<4> 61 {{{ 62 }}} 63 64 ############################################################################### 65 66 Project: "libresample_dll"=.\THIRD_PARTY\BUILD\RESAMPLE\libresample_dll.dsp - Package Owner=<4> 67 68 Package=<5> 69 {{{ 70 }}} 71 72 Package=<4> 73 {{{ 74 }}} 75 76 ############################################################################### 77 78 Project: "libspeex"=.\third_party\build\speex\libspeex.dsp - Package Owner=<4> 79 80 Package=<5> 81 {{{ 82 }}} 83 84 Package=<4> 85 {{{ 86 }}} 87 88 ############################################################################### 89 90 Project: "pjlib"=.\pjlib\build\pjlib.dsp - Package Owner=<4> 91 92 Package=<5> 93 {{{ 94 }}} 95 96 Package=<4> 97 {{{ 98 }}} 99 100 ############################################################################### 101 102 Project: "pjlib_test"=.\pjlib\build\pjlib_test.dsp - Package Owner=<4> 6 Project: "libgsmcodec"=".\THIRD_PARTY\BUILD\GSM\libgsmcodec.dsp" - Package Owner=<4> 7 8 Package=<5> 9 {{{ 10 }}} 11 12 Package=<4> 13 {{{ 14 }}} 15 16 ############################################################################### 17 18 Project: "libilbccodec"=".\THIRD_PARTY\BUILD\ILBC\libilbccodec.dsp" - Package Owner=<4> 19 20 Package=<5> 21 {{{ 22 }}} 23 24 Package=<4> 25 {{{ 26 }}} 27 28 ############################################################################### 29 30 Project: "libmilenage"=".\third_party\build\milenage\libmilenage.dsp" - Package Owner=<4> 31 32 Package=<5> 33 {{{ 34 }}} 35 36 Package=<4> 37 {{{ 38 }}} 39 40 ############################################################################### 41 42 Project: "libportaudio"=".\THIRD_PARTY\BUILD\PORTAUDIO\libportaudio.dsp" - Package Owner=<4> 43 44 Package=<5> 45 {{{ 46 }}} 47 48 Package=<4> 49 {{{ 50 }}} 51 52 ############################################################################### 53 54 Project: "libresample"=".\THIRD_PARTY\BUILD\RESAMPLE\libresample.dsp" - Package Owner=<4> 55 56 Package=<5> 57 {{{ 58 }}} 59 60 Package=<4> 61 {{{ 62 }}} 63 64 ############################################################################### 65 66 Project: "libresample_dll"=".\THIRD_PARTY\BUILD\RESAMPLE\libresample_dll.dsp" - Package Owner=<4> 67 68 Package=<5> 69 {{{ 70 }}} 71 72 Package=<4> 73 {{{ 74 }}} 75 76 ############################################################################### 77 78 Project: "libspeex"=".\third_party\build\speex\libspeex.dsp" - Package Owner=<4> 79 80 Package=<5> 81 {{{ 82 }}} 83 84 Package=<4> 85 {{{ 86 }}} 87 88 ############################################################################### 89 90 Project: "libsrtp"=".\third_party\build\srtp\libsrtp.dsp" - Package Owner=<4> 91 92 Package=<5> 93 {{{ 94 }}} 95 96 Package=<4> 97 {{{ 98 }}} 99 100 ############################################################################### 101 102 Project: "pjlib"=".\pjlib\build\pjlib.dsp" - Package Owner=<4> 103 104 Package=<5> 105 {{{ 106 }}} 107 108 Package=<4> 109 {{{ 110 }}} 111 112 ############################################################################### 113 114 Project: "pjlib_test"=".\pjlib\build\pjlib_test.dsp" - Package Owner=<4> 103 115 104 116 Package=<5> … … 145 157 ############################################################################### 146 158 147 Project: "pjmedia"= .\pjmedia\build\pjmedia.dsp- Package Owner=<4>148 149 Package=<5> 150 {{{ 151 }}} 152 153 Package=<4> 154 {{{ 155 }}} 156 157 ############################################################################### 158 159 Project: "pjmedia_codec"= .\pjmedia\build\pjmedia_codec.dsp- Package Owner=<4>160 161 Package=<5> 162 {{{ 163 }}} 164 165 Package=<4> 166 {{{ 167 }}} 168 169 ############################################################################### 170 171 Project: "pjnath"= .\pjnath\build\pjnath.dsp- Package Owner=<4>172 173 Package=<5> 174 {{{ 175 }}} 176 177 Package=<4> 178 {{{ 179 }}} 180 181 ############################################################################### 182 183 Project: "pjsip_core"= .\pjsip\build\pjsip_core.dsp- Package Owner=<4>184 185 Package=<5> 186 {{{ 187 }}} 188 189 Package=<4> 190 {{{ 191 }}} 192 193 ############################################################################### 194 195 Project: "pjsip_simple"= .\pjsip\build\pjsip_simple.dsp- Package Owner=<4>196 197 Package=<5> 198 {{{ 199 }}} 200 201 Package=<4> 202 {{{ 203 }}} 204 205 ############################################################################### 206 207 Project: "pjsip_ua"= .\pjsip\build\pjsip_ua.dsp- Package Owner=<4>159 Project: "pjmedia"=".\pjmedia\build\pjmedia.dsp" - Package Owner=<4> 160 161 Package=<5> 162 {{{ 163 }}} 164 165 Package=<4> 166 {{{ 167 }}} 168 169 ############################################################################### 170 171 Project: "pjmedia_codec"=".\pjmedia\build\pjmedia_codec.dsp" - Package Owner=<4> 172 173 Package=<5> 174 {{{ 175 }}} 176 177 Package=<4> 178 {{{ 179 }}} 180 181 ############################################################################### 182 183 Project: "pjnath"=".\pjnath\build\pjnath.dsp" - Package Owner=<4> 184 185 Package=<5> 186 {{{ 187 }}} 188 189 Package=<4> 190 {{{ 191 }}} 192 193 ############################################################################### 194 195 Project: "pjsip_core"=".\pjsip\build\pjsip_core.dsp" - Package Owner=<4> 196 197 Package=<5> 198 {{{ 199 }}} 200 201 Package=<4> 202 {{{ 203 }}} 204 205 ############################################################################### 206 207 Project: "pjsip_simple"=".\pjsip\build\pjsip_simple.dsp" - Package Owner=<4> 208 209 Package=<5> 210 {{{ 211 }}} 212 213 Package=<4> 214 {{{ 215 }}} 216 217 ############################################################################### 218 219 Project: "pjsip_ua"=".\pjsip\build\pjsip_ua.dsp" - Package Owner=<4> 208 220 209 221 Package=<5> … … 270 282 Project_Dep_Name libmilenage 271 283 End Project Dependency 272 }}} 273 274 ############################################################################### 275 276 Project: "pjsua_lib"=.\pjsip\build\pjsua_lib.dsp - Package Owner=<4> 284 Begin Project Dependency 285 Project_Dep_Name libsrtp 286 End Project Dependency 287 }}} 288 289 ############################################################################### 290 291 Project: "pjsua_lib"=".\pjsip\build\pjsua_lib.dsp" - Package Owner=<4> 277 292 278 293 Package=<5> … … 394 409 ############################################################################### 395 410 396 Project: "test_pjsip"= .\pjsip\build\test_pjsip.dsp- Package Owner=<4>411 Project: "test_pjsip"=".\pjsip\build\test_pjsip.dsp" - Package Owner=<4> 397 412 398 413 Package=<5> -
pjproject/branches/users/nanang/third_party/build/srtp
- Property svn:ignore
-
old new 1 1 *.user 2 *.plg
-
- Property svn:ignore
-
pjproject/branches/users/nanang/third_party/build/srtp/config.h
r1698 r1699 1 #ifdef _WIN32 2 #include "../../srtp/config.hw" 1 /* config.h for Win32/MSVC */ 2 3 /* Define if building for a CISC machine (e.g. Intel). */ 4 #define CPU_CISC 1 5 6 /* Define if building for a RISC machine (assume slow byte access). */ 7 /* #undef CPU_RISC */ 8 9 /* Path to random device */ 10 /* #define DEV_URANDOM "/dev/urandom" */ 11 12 /* Define to compile in dynamic debugging system. */ 13 #define ENABLE_DEBUGGING 1 14 15 /* Report errors to this file. */ 16 /* #undef ERR_REPORTING_FILE */ 17 18 /* Define to use logging to stdout. */ 19 #define ERR_REPORTING_STDOUT 1 20 21 /* Define this to use ISMAcryp code. */ 22 /* #undef GENERIC_AESICM */ 23 24 /* Define to 1 if you have the <arpa/inet.h> header file. */ 25 /* #undef HAVE_ARPA_INET_H */ 26 27 /* Define to 1 if you have the <byteswap.h> header file. */ 28 /* #undef HAVE_BYTESWAP_H */ 29 30 /* Define to 1 if you have the `inet_aton' function. */ 31 /* #undef HAVE_INET_ATON */ 32 33 /* Define to 1 if the system has the type `int16_t'. */ 34 #define HAVE_INT16_T 1 35 36 /* Define to 1 if the system has the type `int32_t'. */ 37 #define HAVE_INT32_T 1 38 39 /* Define to 1 if the system has the type `int8_t'. */ 40 #define HAVE_INT8_T 1 41 42 /* Define to 1 if you have the <inttypes.h> header file. */ 43 /* #undef HAVE_INTTYPES_H */ 44 45 /* Define to 1 if you have the `socket' library (-lsocket). */ 46 /* #undef HAVE_LIBSOCKET */ 47 48 /* Define to 1 if you have the <machine/types.h> header file. */ 49 /* #undef HAVE_MACHINE_TYPES_H */ 50 51 /* Define to 1 if you have the <memory.h> header file. */ 52 #define HAVE_MEMORY_H 1 53 54 /* Define to 1 if you have the <netinet/in.h> header file. */ 55 /* #undef HAVE_NETINET_IN_H */ 56 57 /* Define to 1 if you have the `socket' function. */ 58 /* #undef HAVE_SOCKET */ 59 60 /* Define to 1 if you have the <stdint.h> header file. */ 61 /* #undef HAVE_STDINT_H */ 62 63 /* Define to 1 if you have the <stdlib.h> header file. */ 64 #define HAVE_STDLIB_H 1 65 66 /* Define to 1 if you have the <strings.h> header file. */ 67 #define HAVE_STRINGS_H 1 68 69 /* Define to 1 if you have the <string.h> header file. */ 70 #define HAVE_STRING_H 1 71 72 /* Define to 1 if you have the <syslog.h> header file. */ 73 /* #undef HAVE_SYSLOG_H */ 74 75 /* Define to 1 if you have the <sys/int_types.h> header file. */ 76 /* #undef HAVE_SYS_INT_TYPES_H */ 77 78 /* Define to 1 if you have the <sys/socket.h> header file. */ 79 /* #undef HAVE_SYS_SOCKET_H */ 80 81 /* Define to 1 if you have the <sys/stat.h> header file. */ 82 #define HAVE_SYS_STAT_H 1 83 84 /* Define to 1 if you have the <sys/types.h> header file. */ 85 #define HAVE_SYS_TYPES_H 1 86 87 /* Define to 1 if you have the <sys/uio.h> header file. */ 88 /* #undef HAVE_SYS_UIO_H */ 89 90 /* Define to 1 if the system has the type `uint16_t'. */ 91 #define HAVE_UINT16_T 1 92 93 /* Define to 1 if the system has the type `uint32_t'. */ 94 #define HAVE_UINT32_T 1 95 96 /* Define to 1 if the system has the type `uint64_t'. */ 97 #define HAVE_UINT64_T 1 98 99 /* Define to 1 if the system has the type `uint8_t'. */ 100 #define HAVE_UINT8_T 1 101 102 /* Define to 1 if you have the <unistd.h> header file. */ 103 /* #undef HAVE_UNISTD_H */ 104 105 /* Define to 1 if you have the `usleep' function. */ 106 /* #undef HAVE_USLEEP */ 107 108 /* Define to 1 if you have the <windows.h> header file. */ 109 #define HAVE_WINDOWS_H 1 110 111 /* Define to 1 if you have the <winsock2.h> header file. */ 112 #define HAVE_WINSOCK2_H 1 113 114 /* Define to use X86 inlined assembly code */ 115 /* #undef HAVE_X86 */ 116 117 /* Define to the address where bug reports for this package should be sent. */ 118 #define PACKAGE_BUGREPORT "" 119 120 /* Define to the full name of this package. */ 121 #define PACKAGE_NAME "" 122 123 /* Define to the full name and version of this package. */ 124 #define PACKAGE_STRING "" 125 126 /* Define to the one symbol short name of this package. */ 127 #define PACKAGE_TARNAME "" 128 129 /* Define to the version of this package. */ 130 #define PACKAGE_VERSION "" 131 132 /* The size of a `unsigned long', as computed by sizeof. */ 133 #define SIZEOF_UNSIGNED_LONG 4 134 135 /* The size of a `unsigned long long', as computed by sizeof. */ 136 #define SIZEOF_UNSIGNED_LONG_LONG 8 137 138 /* Define to use GDOI. */ 139 /* #undef SRTP_GDOI */ 140 141 /* Define to compile for kernel contexts. */ 142 /* #undef SRTP_KERNEL */ 143 144 /* Define to compile for Linux kernel context. */ 145 /* #undef SRTP_KERNEL_LINUX */ 146 147 /* Define to 1 if you have the ANSI C header files. */ 148 #define STDC_HEADERS 1 149 150 /* Write errors to this file */ 151 /* #undef USE_ERR_REPORTING_FILE */ 152 153 /* Define to use syslog logging. */ 154 /* #undef USE_SYSLOG */ 155 156 /* Define to 1 if your processor stores words with the most significant byte 157 first (like Motorola and SPARC, unlike Intel and VAX). */ 158 /* #undef WORDS_BIGENDIAN */ 159 160 /* Define to empty if `const' does not conform to ANSI C. */ 161 /* #undef const */ 162 163 /* Define 'inline' to nothing, since the MSVC compiler doesn't support it. */ 164 #define inline 165 166 /* Define to `unsigned' if <sys/types.h> does not define. */ 167 /* #undef size_t */ 168 169 #if (_MSC_VER >= 1400) // VC8+ 170 # ifndef _CRT_SECURE_NO_DEPRECATE 171 # define _CRT_SECURE_NO_DEPRECATE 172 # endif 173 # ifndef _CRT_NONSTDC_NO_DEPRECATE 174 # define _CRT_NONSTDC_NO_DEPRECATE 175 # endif 176 #endif // VC8+ 177 178 #ifndef uint32_t 179 typedef unsigned char uint8_t; 180 typedef unsigned short uint16_t; 181 typedef unsigned int uint32_t; 182 typedef unsigned __int64 uint64_t; 183 typedef signed char int8_t; 184 typedef short int16_t; 185 typedef int int32_t; 186 typedef __int64 int64_t; 3 187 #endif 188 189 #ifdef _MSC_VER 190 #pragma warning(disable:4311) 191 #pragma warning(disable:4761) // integral mismatch 192 #pragma warning(disable:4018) // signed/unsigned mismatch 193 #pragma warning(disable:4244) // conversion from int64 to int 194 #endif -
pjproject/branches/users/nanang/third_party/build/srtp/libsrtp.vcproj
r1698 r1699 162 162 > 163 163 <File 164 RelativePath="..\..\srtp\include\config.h" 165 > 166 </File> 167 <File 168 RelativePath=".\config_win32.h" 164 RelativePath=".\config.h" 169 165 > 170 166 </File> -
pjproject/branches/users/nanang/third_party/srtp/srtp/srtp.c
r1697 r1699 484 484 } 485 485 #else 486 #if _MSC_VER <= 1200 487 key_limit_set(srtp->limit, 0xffffffffffffI64); 488 #else 486 489 key_limit_set(srtp->limit, 0xffffffffffffLL); 490 #endif 487 491 #endif 488 492
Note: See TracChangeset
for help on using the changeset viewer.
