Changeset 687


Ignore:
Timestamp:
Aug 15, 2006 11:44:13 PM (16 years ago)
Author:
bennylp
Message:

The bloody thing links!!

Location:
pjproject/branches/symbian
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/symbian/build/cc-mwcc.mak

    r681 r687  
    77#o 
    88# -ledll.lib -leuser.lib -lestlib.lib 
    9 export LDEXE = mwldsym2.exe -sym full -subsystem windows -msgstyle parseable -nowraplines -nodefaultlibs -stdlib -L"C:\Symbian\9.1\S60_3rd\epoc32\release\winscw\udeb" -L"C:\dev\pj\symbian\pjlib\lib" -noimplib -m="?_E32Bootstrap@@YGXXZ" 
     9export LDEXE = mwldsym2.exe -sym full -subsystem windows -msgstyle parseable -nowraplines -nodefaultlibs -stdlib -L"C:\Symbian\9.1\S60_3rd\epoc32\release\winscw\udeb" -L"C:\dev\pj\symbian\pjlib\lib" -L"C:\project\symbian\pjlib\lib" -noimplib -m="?_E32Bootstrap@@YGXXZ" 
    1010export LDOUT = -o  
    1111export RANLIB = ranlib 
     
    2727export CC_CXXFLAGS := -sym full -wchar_t off -align 4 -enum int -str pool -nostdinc -exc ms -inline off -msgstyle parseable -nowraplines -O0 -D_UNICODE -D__SYMBIAN32__ -D__CW32__ -D__WINS__ -D__DLL__ -D__WINSCW__ -D_DEBUG -D__SUPPORT_CPP_EXCEPTIONS__ -D__SERIES60_30__ -D__SERIES60_3X__ -w cmdline -w pragmas -w empty -w possible -w unusedvar -w extracomma -w pedantic -w largeargs -w ptrintconv -w tokenpasting -w missingreturn 
    2828export CC_LDFLAGS := 
    29 export MWLibraries=C:\dev\pj\symbian\pjlib\lib;C:\Program Files\Carbide\plugins\com.nokia.carbide.cpp.support_1.0.0\Symbian_Support\Win32-x86 Support\Libraries\Win32 SDK;C:\Program Files\Carbide\plugins\com.nokia.carbide.cpp.support_1.0.0\Symbian_Support\MSL\MSL_C\MSL_Common\Include;C:\Program Files\Carbide\plugins\com.nokia.carbide.cpp.support_1.0.0\Symbian_Support\MSL\MSL_C\MSL_Win32\Include;C:\Program Files\Carbide\plugins\com.nokia.carbide.cpp.support_1.0.0\Symbian_Support\MSL\MSL_C++\MSL_Common\Include;C:\Program Files\Carbide\plugins\com.nokia.carbide.cpp.support_1.0.0\Symbian_Support\Runtime\Runtime_x86\Runtime_Win32\Libs 
     29export MWLibraries=C:\dev\pj\symbian\pjlib\lib;C:\project\symbian\pjlib\lib;C:\Program Files\Carbide\plugins\com.nokia.carbide.cpp.support_1.0.0\Symbian_Support\Win32-x86 Support\Libraries\Win32 SDK;C:\Program Files\Carbide\plugins\com.nokia.carbide.cpp.support_1.0.0\Symbian_Support\MSL\MSL_C\MSL_Common\Include;C:\Program Files\Carbide\plugins\com.nokia.carbide.cpp.support_1.0.0\Symbian_Support\MSL\MSL_C\MSL_Win32\Include;C:\Program Files\Carbide\plugins\com.nokia.carbide.cpp.support_1.0.0\Symbian_Support\MSL\MSL_C++\MSL_Common\Include;C:\Program Files\Carbide\plugins\com.nokia.carbide.cpp.support_1.0.0\Symbian_Support\Runtime\Runtime_x86\Runtime_Win32\Libs 
    3030export MWSym2LibraryFiles=libpj-symbian.lib;gdi32.lib;user32.lib;kernel32.lib;MSL_All_MSE_Symbian.lib;MSL_All_x86.lib;MSL_All_x86_Symbian.lib 
    3131 
  • pjproject/branches/symbian/pjlib/build/Makefile

    r681 r687  
    3030        rbtree.o string.o timer.o \ 
    3131        types.o symbols.o 
    32 export PJLIB_CFLAGS += $(_CFLAGS) 
    33 export PJLIB_CXXFLAGS += $(_CXXFLAGS) 
     32export PJLIB_CFLAGS += $(_CFLAGS) -DPJ_EXPORTING 
     33export PJLIB_CXXFLAGS += $(_CXXFLAGS) -DPJ_EXPORTING 
    3434 
    3535############################################################################### 
     
    4646                    udp_echo_srv_sync.o udp_echo_srv_ioqueue.o \ 
    4747                    util.o 
    48 export TEST_CFLAGS += $(_CFLAGS) 
    49 export TEST_CXXFLAGS += $(_CXXFLAGS) 
     48export TEST_CFLAGS += $(_CFLAGS) -DPJ_IMPORTING 
     49export TEST_CXXFLAGS += $(_CXXFLAGS) -DPJ_IMPORTING 
    5050export TEST_LDFLAGS += $(_LDFLAGS) 
    5151export TEST_EXE := ../bin/pjlib-test-$(TARGET_NAME)$(HOST_EXE) 
  • pjproject/branches/symbian/pjlib/build/os-symbian.mak

    r686 r687  
    3333# 
    3434#-L"C:\project\symbian\pjlib\lib" - 
    35 export TEST_LDFLAGS +=  -leexe.lib -leuser.lib -L..\ -lpj-symbian.lib 
     35export TEST_LDFLAGS +=  -leexe.lib -leuser.lib -lestlib.lib -L..\ -lpj-symbian.lib 
    3636 
    3737# 
  • pjproject/branches/symbian/pjlib/include/pj/compat/os_symbian.h

    r682 r687  
    140140#include <e32def.h> 
    141141 
     142#if defined(PJ_EXPORTING) 
     143#   define PJ_EXPORT_IMPORT EXPORT_C 
     144#elif defined(PJ_IMPORTING) 
     145#   define PJ_EXPORT_IMPORT IMPORT_C 
     146#else 
     147#   error "Must define either PJ_EXPORTING or PJ_IMPORTING" 
     148#endif 
     149 
    142150#endif  /* __PJ_COMPAT_OS_SYMBIAN_H__ */ 
    143151 
  • pjproject/branches/symbian/pjlib/include/pj/compat/string.h

    r490 r687  
    7373#   include <pj/types.h> 
    7474#   include <pj/compat/stdarg.h> 
     75    PJ_BEGIN_DECL 
    7576    PJ_DECL(int) snprintf(char *s1, pj_size_t len, const char *s2, ...); 
    7677    PJ_DECL(int) vsnprintf(char *s1, pj_size_t len, const char *s2, va_list arg); 
     78    PJ_END_DECL 
    7779#endif 
    7880 
  • pjproject/branches/symbian/pjlib/include/pj/config.h

    r682 r687  
    479479 */ 
    480480#ifdef __cplusplus 
    481 #  define PJ_DECL(type)             type 
    482 #  define PJ_DECL_NO_RETURN(type)   type PJ_NORETURN 
    483 #  define PJ_IDECL_NO_RETURN(type)  PJ_INLINE(type) PJ_NORETURN 
     481#  define PJ_DECL(type)             PJ_EXPORT_IMPORT type 
     482#  define PJ_DECL_NO_RETURN(type)   PJ_EXPORT_IMPORT type PJ_NORETURN 
     483#  define PJ_IDECL_NO_RETURN(type)  PJ_EXPORT_IMPORT PJ_INLINE(type) PJ_NORETURN 
    484484#  define PJ_BEGIN_DECL             extern "C" { 
    485485#  define PJ_END_DECL               } 
    486486#else 
    487 #  define PJ_DECL(type)             EXPORT_C extern type 
    488 #  define PJ_DECL_NO_RETURN(type)   EXPORT_C PJ_NORETURN type 
    489 #  define PJ_IDECL_NO_RETURN(type)  EXPORT_C PJ_NORETURN PJ_INLINE(type) 
    490 #  define PJ_BEGIN_DECL 
     487#  define PJ_DECL(type)             PJ_EXPORT_IMPORT type 
     488#  define PJ_DECL_NO_RETURN(type)   PJ_EXPORT_IMPORT PJ_NORETURN type 
     489#  define PJ_IDECL_NO_RETURN(type)  PJ_EXPORT_IMPORT PJ_NORETURN PJ_INLINE(type) 
     490#  define PJ_BEGIN_DECL              
    491491#  define PJ_END_DECL 
    492492#endif 
  • pjproject/branches/symbian/pjlib/include/pj/pool.h

    r364 r687  
    391391 *  - access to pool factory is not serialized (i.e. not thread safe). 
    392392 */ 
    393 extern pj_pool_factory_policy pj_pool_factory_default_policy; 
     393PJ_DECL(pj_pool_factory_policy*) pj_pool_factory_get_default_policy(void); 
     394 
    394395 
    395396/** 
  • pjproject/branches/symbian/pjlib/src/pj/pool_policy_malloc.c

    r364 r687  
    6464}; 
    6565 
     66PJ_DEF(pj_pool_factory_policy*) pj_pool_factory_get_default_policy(void) 
     67{ 
     68    return &pj_pool_factory_default_policy; 
     69} 
     70 
     71 
    6672#endif  /* PJ_HAS_POOL_ALT_API */ 
  • pjproject/branches/symbian/pjlib/src/pjlib-test/test.c

    r433 r687  
    6565     
    6666    //pj_dump_config(); 
    67     pj_caching_pool_init( &caching_pool, &pj_pool_factory_default_policy, 0 ); 
     67    pj_caching_pool_init( &caching_pool, pj_pool_factory_get_default_policy(), 
     68                          0 ); 
    6869 
    6970#if INCLUDE_ERRNO_TEST 
Note: See TracChangeset for help on using the changeset viewer.