Changeset 681


Ignore:
Timestamp:
Aug 14, 2006 11:18:57 PM (16 years ago)
Author:
ismangil
Message:

Work in progress. Linking problems.

Location:
pjproject/branches/symbian
Files:
6 edited

Legend:

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

    r680 r681  
    11export CC = mwccsym2 -c 
    2 export AR = echo ar 
     2export AR = ar rv 
    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 
    44 
     
    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" -noimplib -m="?_E32Bootstrap@@YGXXZ" -leexe.lib -leuser.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" -L"C:\dev\pj\symbian\pjlib\lib" -noimplib -m="?_E32Bootstrap@@YGXXZ" 
    1010export LDOUT = -o  
    11 export RANLIB = echo ranlib 
     11export RANLIB = ranlib 
    1212 
    1313export OBJEXT := .o 
     14export STATICLIBEXT := .lib 
    1415export LIBEXT := .dll 
    1516export LIBEXT2 := 
     
    2627export 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 
    2728export CC_LDFLAGS := 
    28 export 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 
    29 export MWSym2LibraryFiles=gdi32.lib;user32.lib;kernel32.lib;MSL_All_MSE_Symbian.lib;MSL_All_x86.lib;MSL_All_x86_Symbian.lib 
     29export 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 
     30export MWSym2LibraryFiles=libpj-symbian.lib;gdi32.lib;user32.lib;kernel32.lib;MSL_All_MSE_Symbian.lib;MSL_All_x86.lib;MSL_All_x86_Symbian.lib 
    3031 
  • pjproject/branches/symbian/build/rules.mak

    r680 r681  
    66# 
    77LIB = $($(APP)_LIB) 
     8STATICLIB = $($(APP)_STATICLIB) 
    89 
    910# 
     
    7172        @echo LIBDIR=$(LIBDIR) 
    7273 
    73 #$(LIB): $(LIBDIR) $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP) 
    74 #       $(AR)$(LIB) $(OBJS) 
    75 #       $(RANLIB) $(LIB) 
    76          
     74#$(STATICLIB): $(LIBDIR) $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP) 
     75#       $(AR) $(STATICLIB) $(OBJS) 
     76#       $(RANLIB) $(STATICLIB) 
     77 
    7778$(LIB): $(LIBDIR) $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP) 
    7879        $(LD) $(LDOUT)$(subst /,$(HOST_PSEP),$(LIB)) -search \ 
     
    8081 
    8182$(EXE): $(BINDIR) $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP) 
    82         $(LDEXE) $(LDOUT)$(subst /,$(HOST_PSEP),$(EXE)) \ 
     83        $(LDEXE) $(LDOUT)$(subst /,$(HOST_PSEP),$(EXE)) -search \ 
    8384            $(subst /,$(HOST_PSEP),$(OBJS)) $($(APP)_LDFLAGS) 
    8485 
  • pjproject/branches/symbian/pjlib/build/Makefile

    r680 r681  
    55 
    66export PJLIB_LIB := ../lib/libpj-$(TARGET_NAME)$(LIBEXT) 
     7export PJLIB_STATICLIB := ../lib/libpj-$(TARGET_NAME)$(STATICLIBEXT) 
    78 
    89############################################################################### 
     
    1314export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ 
    1415                   $(HOST_CXXFLAGS) $(CXXFLAGS) 
    15 export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJLIB_LIB)) \ 
     16export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJLIB_STATICLIB)) \ 
    1617                   $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \ 
    1718                   $(LDFLAGS)  
     19 
     20 
    1821 
    1922############################################################################### 
     
    3437# 
    3538export TEST_SRCDIR = ../src/pjlib-test 
     39export TEST_OBJS +=  
    3640export TEST_OBJS += atomic.o echo_clt.o errno.o exception.o \ 
    3741                    fifobuf.o file.o \ 
  • pjproject/branches/symbian/pjlib/build/os-symbian.mak

    r680 r681  
    1919# the test application. 
    2020# 
    21 export TEST_OBJS += main.o main_symbian.o  
     21export TEST_OBJS += main_symbian.o  
    2222 
    2323# 
     
    3030# Additional LDFLAGS for pjlib-test 
    3131# 
    32 export TEST_LDFLAGS +=  
     32export TEST_LDFLAGS +=  -leexe.lib -leuser.lib -llibpj-symbian.lib 
    3333 
    3434# 
  • pjproject/branches/symbian/pjlib/src/pj/os_core_symbian.cpp

    r680 r681  
    1717 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  
    1818 */ 
     19 
     20//Auto-generated file. Please do not modify. 
     21#include <e32cmn.h> 
     22#pragma data_seg(".SYMBIAN") 
     23__EMULATOR_IMAGE_HEADER2 (0x10000079,0x1000008d,0x1000425b,EPriorityForeground,0x00000000u,0x00000000u,0x00000000,0x70000001,0x00000000,0) 
     24#pragma data_seg() 
     25 
    1926 
    2027#include <e32std.h> 
     
    200207    if (sleep(msec * 1000) == 0) 
    201208        return PJ_SUCCESS; 
     209         
     210    return PJ_SUCCESS; 
    202211} 
    203212 
  • pjproject/branches/symbian/pjlib/src/pjlib-test/main_symbian.cpp

    r680 r681  
     1//Auto-generated file. Please do not modify. 
     2#include <e32cmn.h> 
     3#pragma data_seg(".SYMBIAN") 
     4__EMULATOR_IMAGE_HEADER2 (0x1000007a,0x00000000,0x00000000,EPriorityForeground,0x00000000u,0x00000000u,0x00000000,0x00000000,0x00000000,0) 
     5#pragma data_seg() 
     6 
    17#include "test.h" 
    28#include <pj/os.h> 
     
    2632    // add your program code here, example code below 
    2733    // 
    28     console->Write(_L("Hello, world!\n")); 
     34    test_main(); 
    2935    } 
    3036 
Note: See TracChangeset for help on using the changeset viewer.