Changeset 687

Timestamp:

Aug 15, 2006 11:44:13 PM (18 years ago)

Author:

bennylp

Message:

The bloody thing links!!

Location:

pjproject/branches/symbian

Files:

• build/cc-mwcc.mak (modified) (2 diffs)
• pjlib/build/Makefile (modified) (2 diffs)
• pjlib/build/os-symbian.mak (modified) (1 diff)
• pjlib/include/pj/compat/os_symbian.h (modified) (1 diff)
• pjlib/include/pj/compat/string.h (modified) (1 diff)
• pjlib/include/pj/config.h (modified) (1 diff)
• pjlib/include/pj/pool.h (modified) (1 diff)
• pjlib/src/pj/pool_policy_malloc.c (modified) (1 diff)
• pjlib/src/pjlib-test/test.c (modified) (1 diff)

pjproject/branches/symbian/build/cc-mwcc.mak

@@ -7 +7 @@
 #o
 # -ledll.lib -leuser.lib -lestlib.lib
-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"
+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" -L"C:\project\symbian\pjlib\lib" -noimplib -m="?_E32Bootstrap@@YGXXZ"
 export LDOUT = -o 
 export RANLIB = ranlib
@@ -27 +27 @@
 export 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
 export CC_LDFLAGS :=
-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
+export 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
 export MWSym2LibraryFiles=libpj-symbian.lib;gdi32.lib;user32.lib;kernel32.lib;MSL_All_MSE_Symbian.lib;MSL_All_x86.lib;MSL_All_x86_Symbian.lib
 

pjproject/branches/symbian/pjlib/build/Makefile

@@ -30 +30 @@
         rbtree.o string.o timer.o \
         types.o symbols.o
-export PJLIB_CFLAGS += $(_CFLAGS)
-export PJLIB_CXXFLAGS += $(_CXXFLAGS)
+export PJLIB_CFLAGS += $(_CFLAGS) -DPJ_EXPORTING
+export PJLIB_CXXFLAGS += $(_CXXFLAGS) -DPJ_EXPORTING
 
 ###############################################################################
@@ -46 +46 @@
                     udp_echo_srv_sync.o udp_echo_srv_ioqueue.o \
                     util.o
-export TEST_CFLAGS += $(_CFLAGS)
-export TEST_CXXFLAGS += $(_CXXFLAGS)
+export TEST_CFLAGS += $(_CFLAGS) -DPJ_IMPORTING
+export TEST_CXXFLAGS += $(_CXXFLAGS) -DPJ_IMPORTING
 export TEST_LDFLAGS += $(_LDFLAGS)
 export TEST_EXE := ../bin/pjlib-test-$(TARGET_NAME)$(HOST_EXE)

pjproject/branches/symbian/pjlib/build/os-symbian.mak

@@ -33 +33 @@
 #
 #-L"C:\project\symbian\pjlib\lib" -
-export TEST_LDFLAGS +=  -leexe.lib -leuser.lib -L..\ -lpj-symbian.lib
+export TEST_LDFLAGS +=  -leexe.lib -leuser.lib -lestlib.lib -L..\ -lpj-symbian.lib
 
 #

pjproject/branches/symbian/pjlib/include/pj/compat/os_symbian.h

@@ -140 +140 @@
 #include <e32def.h>
 
+#if defined(PJ_EXPORTING)
+#   define PJ_EXPORT_IMPORT EXPORT_C
+#elif defined(PJ_IMPORTING)
+#   define PJ_EXPORT_IMPORT IMPORT_C
+#else
+#   error "Must define either PJ_EXPORTING or PJ_IMPORTING"
+#endif
+
 #endif  /* __PJ_COMPAT_OS_SYMBIAN_H__ */
 

pjproject/branches/symbian/pjlib/include/pj/compat/string.h

@@ -73 +73 @@
 #   include <pj/types.h>
 #   include <pj/compat/stdarg.h>
+    PJ_BEGIN_DECL
     PJ_DECL(int) snprintf(char *s1, pj_size_t len, const char *s2, ...);
     PJ_DECL(int) vsnprintf(char *s1, pj_size_t len, const char *s2, va_list arg);
+    PJ_END_DECL
 #endif
 

pjproject/branches/symbian/pjlib/include/pj/config.h

@@ -479 +479 @@
  */
 #ifdef __cplusplus
-#  define PJ_DECL(type)             type
-#  define PJ_DECL_NO_RETURN(type)   type PJ_NORETURN
-#  define PJ_IDECL_NO_RETURN(type)  PJ_INLINE(type) PJ_NORETURN
+#  define PJ_DECL(type)             PJ_EXPORT_IMPORT type
+#  define PJ_DECL_NO_RETURN(type)   PJ_EXPORT_IMPORT type PJ_NORETURN
+#  define PJ_IDECL_NO_RETURN(type)  PJ_EXPORT_IMPORT PJ_INLINE(type) PJ_NORETURN
 #  define PJ_BEGIN_DECL             extern "C" {
 #  define PJ_END_DECL               }
 #else
-#  define PJ_DECL(type)             EXPORT_C extern type
-#  define PJ_DECL_NO_RETURN(type)   EXPORT_C PJ_NORETURN type
-#  define PJ_IDECL_NO_RETURN(type)  EXPORT_C PJ_NORETURN PJ_INLINE(type)
-#  define PJ_BEGIN_DECL
+#  define PJ_DECL(type)             PJ_EXPORT_IMPORT type
+#  define PJ_DECL_NO_RETURN(type)   PJ_EXPORT_IMPORT PJ_NORETURN type
+#  define PJ_IDECL_NO_RETURN(type)  PJ_EXPORT_IMPORT PJ_NORETURN PJ_INLINE(type)
+#  define PJ_BEGIN_DECL             
 #  define PJ_END_DECL
 #endif

pjproject/branches/symbian/pjlib/include/pj/pool.h

@@ -391 +391 @@
  *  - access to pool factory is not serialized (i.e. not thread safe).
  */
-extern pj_pool_factory_policy pj_pool_factory_default_policy;
+PJ_DECL(pj_pool_factory_policy*) pj_pool_factory_get_default_policy(void);
+
 
 /**

pjproject/branches/symbian/pjlib/src/pj/pool_policy_malloc.c

@@ -64 +64 @@
 };
 
+PJ_DEF(pj_pool_factory_policy*) pj_pool_factory_get_default_policy(void)
+{
+    return &pj_pool_factory_default_policy;
+}
+
+
 #endif  /* PJ_HAS_POOL_ALT_API */

pjproject/branches/symbian/pjlib/src/pjlib-test/test.c

@@ -65 +65 @@
     
     //pj_dump_config();
-    pj_caching_pool_init( &caching_pool, &pj_pool_factory_default_policy, 0 );
+    pj_caching_pool_init( &caching_pool, pj_pool_factory_get_default_policy(),
+                          0 );
 
 #if INCLUDE_ERRNO_TEST