Changeset 680


Ignore:
Timestamp:
Aug 14, 2006 12:55:27 AM (16 years ago)
Author:
ismangil
Message:

Work in progress. Compile and links cleanly. Executes in console mode still buggy.

Location:
pjproject/branches/symbian
Files:
1 added
6 edited

Legend:

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

    r679 r680  
    22export AR = echo ar 
    33export LD = mwldsym2.exe -sym full -subsystem windows -msgstyle parseable -nowraplines -nodefaultlibs -addcommand export:_E32Dll\=__E32Dll -shared -export dllexport -stdlib -L"C:\Symbian\9.1\S60_3rd\Epoc32\release\winscw\udeb" -L"C:\Program Files\Carbide\plugins\com.nokia.carbide.cpp.support_1.0.0\Symbian_Support\Runtime\Runtime_x86\Runtime_Win32\Libs" -ledll.lib -leuser.lib -lestlib.lib 
     4 
     5#mwldsym2.exe -sym full -subsystem windows -msgstyle parseable -nowraplines -nodefaultlibs -stdlib -L"C:\Symbian\9.1\S60_3rd\Epoc32\release\winscw\udeb" -L"C:\Program Files\Carbide\plugins\com.nokia.carbide.cpp.support_1.0.0\Symbian_Support\Runtime\Runtime_x86\Runtime_Win32\Libs" 
     6#DLL -addcommand export:_E32Dll\=__E32Dll -shared -export dllexport  
     7#o 
     8# -ledll.lib -leuser.lib -lestlib.lib 
     9export LDEXE = mwldsym2.exe -sym full -subsystem windows -msgstyle parseable -nowraplines -nodefaultlibs -stdlib -L"C:\Symbian\9.1\S60_3rd\epoc32\release\winscw\udeb" -noimplib -m="?_E32Bootstrap@@YGXXZ" -leexe.lib -leuser.lib 
    410export LDOUT = -o  
    511export RANLIB = echo ranlib 
     
    1824export CC_CFLAGS := -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 
    1925#export CC_CFLAGS += -Wdeclaration-after-statement 
    20 export CC_CXXFLAGS :=  
     26export 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 
    2127export CC_LDFLAGS := 
    2228export MWLibraries=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 
  • pjproject/branches/symbian/build/os-symbian.mak

    r679 r680  
    11export OS_CFLAGS   := $(CC_DEF)PJ_SYMBIAN=1 -include "$(SYMBIAN_SDK_PATH)/include/variant/Symbian_OS_v9.1.hrh" -i- $(CC_INC)$(SYMBIAN_SDK_PATH)/include $(CC_INC)$(SYMBIAN_SDK_PATH)/include/variant $(CC_INC)$(SYMBIAN_SDK_PATH)/include/libc $(CC_INC)../src/pjlib-test -O 
    22 
    3 export OS_CXXFLAGS := 
     3export OS_CXXFLAGS   := $(CC_DEF)PJ_SYMBIAN=1 -include "$(SYMBIAN_SDK_PATH)/include/variant/Symbian_OS_v9.1.hrh" -i- $(CC_INC)$(SYMBIAN_SDK_PATH)/include $(CC_INC)$(SYMBIAN_SDK_PATH)/include/variant $(CC_INC)$(SYMBIAN_SDK_PATH)/include/libc $(CC_INC)../src/pjlib-test -O 
    44 
    55export OS_LDFLAGS  :=  
  • pjproject/branches/symbian/build/rules.mak

    r679 r680  
    8080 
    8181$(EXE): $(BINDIR) $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP) 
    82         $(LD) $(LDOUT)$(subst /,$(HOST_PSEP),$(EXE)) \ 
     82        $(LDEXE) $(LDOUT)$(subst /,$(HOST_PSEP),$(EXE)) \ 
    8383            $(subst /,$(HOST_PSEP),$(OBJS)) $($(APP)_LDFLAGS) 
    8484 
  • pjproject/branches/symbian/pjlib/build/Makefile

    r496 r680  
    4343                    util.o 
    4444export TEST_CFLAGS += $(_CFLAGS) 
     45export TEST_CXXFLAGS += $(_CXXFLAGS) 
    4546export TEST_LDFLAGS += $(_LDFLAGS) 
    4647export TEST_EXE := ../bin/pjlib-test-$(TARGET_NAME)$(HOST_EXE) 
  • pjproject/branches/symbian/pjlib/build/os-symbian.mak

    r496 r680  
    1313                        os_error_unix.o os_time_unix.o \ 
    1414                        os_timestamp_common.o os_timestamp_posix.o \ 
    15                         pool_policy_malloc.o compat/string.o sock_bsd.o sock_select.o 
     15                        pool_policy_malloc.o compat/string.o sock_bsd.o sock_select.o  
    1616 
    1717# 
     
    1919# the test application. 
    2020# 
    21 export TEST_OBJS +=     main.o 
     21export TEST_OBJS += main.o main_symbian.o  
    2222 
    2323# 
     
    3030# Additional LDFLAGS for pjlib-test 
    3131# 
    32 export TEST_LDFLAGS += 
     32export TEST_LDFLAGS +=  
    3333 
    3434# 
     
    3939 
    4040 
    41  
  • pjproject/branches/symbian/pjlib/src/pj/os_core_symbian.cpp

    r666 r680  
    6666 * This is the main entry for all threads. 
    6767 */ 
    68 TInt *thread_main(TAny *param) 
     68TInt thread_main(TAny *param) 
    6969{ 
    7070    pj_thread_t *rec = (pj_thread_t *) param; 
    71     TInt *result; 
     71    TInt result; 
    7272    /* pj_status_t rc; */ 
    7373 
     
    7575 
    7676    /* Call user's entry! */ 
    77     result = (TInt*)(long)(*rec->proc)(rec->arg); 
     77    result = (TInt)(*rec->proc)(rec->arg); 
    7878 
    7979    /* Done. */ 
     
    119119    rec->proc = proc; 
    120120    rec->arg = arg; 
    121     _LIT( KThreadName, "A name"); 
    122     rc = rec->thread.Create(KThreadName, thread_main, 4096, KMinHeapSize, 256*16, rec->arg, EOwnerProcess); 
     121    _LIT( KThreadName, "Athread"); 
     122    rc = rec->thread.Create(KThreadName, thread_main, 4096, KMinHeapSize, 256*16, rec->arg, EOwnerThread); 
    123123    if (rc != 0) { 
    124124        return PJ_RETURN_OS_ERROR(rc); 
     
    131131} 
    132132 
     133/* 
     134 * pj_thread-get_name() 
     135 */ 
     136PJ_DEF(const char*) pj_thread_get_name(pj_thread_t *p) 
     137{ 
     138    pj_thread_t *rec = (pj_thread_t*)p; 
     139 
     140    return rec->obj_name; 
     141} 
     142 
     143/* 
     144 * pj_thread_resume() 
     145 */ 
     146PJ_DEF(pj_status_t) pj_thread_resume(pj_thread_t *p) 
     147{ 
     148    pj_status_t rc; 
     149 
     150    pj_thread_t *rec = (pj_thread_t*)p; 
     151 
     152    rec->thread.Resume(); 
     153 
     154    rc = PJ_SUCCESS; 
     155 
     156    return rc; 
     157} 
     158 
     159/* 
     160 * pj_thread_this() 
     161 */ 
     162PJ_DEF(pj_thread_t*) pj_thread_this(void) 
     163{ 
     164    // TODO 
     165    return NULL; 
     166} 
     167 
     168/* 
     169 * pj_thread_join() 
     170 */ 
     171PJ_DEF(pj_status_t) pj_thread_join(pj_thread_t *p) 
     172{ 
     173    pj_thread_t *rec = (pj_thread_t *)p; 
     174    TRequestStatus result; 
     175 
     176    //PJ_LOG(6, (pj_thread_this()->obj_name, "Joining thread %s", p->obj_name)); 
     177 
     178    rec->thread.Rendezvous(result); 
     179 
     180    return PJ_SUCCESS; 
     181} 
     182 
     183/* 
     184 * pj_thread_destroy() 
     185 */ 
     186PJ_DEF(pj_status_t) pj_thread_destroy(pj_thread_t *p) 
     187{ 
     188    pj_thread_t *rec = (pj_thread_t *)p; 
     189    rec->thread.Kill(1); 
     190         
     191 
     192    return PJ_SUCCESS; 
     193} 
     194 
     195/* 
     196 * pj_thread_sleep() 
     197 */ 
     198PJ_DEF(pj_status_t) pj_thread_sleep(unsigned msec) 
     199{ 
     200    if (sleep(msec * 1000) == 0) 
     201        return PJ_SUCCESS; 
     202} 
     203 
     204 
    133205/////////////////////////////////////////////////////////////////////////////// 
    134206/* 
    135207 * pj_thread_local_alloc() 
    136208 */ 
     209 
    137210PJ_DEF(pj_status_t) pj_thread_local_alloc(long *index) 
    138211{ 
     
    175248                                            pj_mutex_t **mutex ) 
    176249{ 
     250    (*mutex) = (pj_mutex_t *)1; 
    177251    return PJ_SUCCESS; 
    178252} 
     
    187261 
    188262/* 
     263 * pj_mutex_trylock() 
     264 */ 
     265PJ_DEF(pj_status_t) pj_mutex_trylock(pj_mutex_t *mutex) 
     266{ 
     267    return PJ_SUCCESS; 
     268} 
     269 
     270/* 
    189271 * pj_mutex_unlock() 
    190272 */ 
Note: See TracChangeset for help on using the changeset viewer.