Changeset 679

Timestamp:

Aug 13, 2006 8:38:02 PM (18 years ago)

Author:

ismangil

Message:

Build system now works for Symbian S60 3rd Ed emulator

Location:

pjproject/branches/symbian/build

Files:

• cc-mwcc.mak (modified) (2 diffs)
• os-symbian.mak (modified) (1 diff)
• rules.mak (modified) (1 diff)

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

@@ -1 +1 @@
 export CC = mwccsym2 -c
-export AR = mwldsym2 -sym full -subsystem windows -msgstyle parseable -nowraplines -nodefaultlibs -library -o 
-export LD = mwldsym2.exe -sym full -subsystem windows -msgstyle parseable -nowraplines -nodefaultlibs -stdlib -noimplib -L"C:\Symbian\7.0s\S80_DP2_0_SDK_CW\epoc32\release\winscw\udeb" -lestlib.lib -leuser.lib -ledll.lib -search -m "?_E32Dll@@YGHPAXI0@Z"
+export AR = echo ar
+export 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
 export LDOUT = -o 
 export RANLIB = echo ranlib
@@ -16 +16 @@
 
 export CC_SOURCES :=
-export 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 unusedarg -w unusedvar -w extracomma -w pedantic -w largeargs -w ptrintconv -w tokenpasting -w missingreturn
-#-include "C:\Symbian\9.1\S60_3rd\epoc32\include\variant\Symbian_OS_v9.1.hrh" -i "C:\dev\symbian\TLS1dll" -i- -i "C:\Symbian\9.1\S60_3rd\epoc32\include" -i "C:\Symbian\9.1\S60_3rd\epoc32\include\variant" 
+export 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
 #export CC_CFLAGS += -Wdeclaration-after-statement
 export CC_CXXFLAGS := 
 export CC_LDFLAGS :=
+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
+export MWSym2LibraryFiles=gdi32.lib;user32.lib;kernel32.lib;MSL_All_MSE_Symbian.lib;MSL_All_x86.lib;MSL_All_x86_Symbian.lib
 

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

@@ -3 +3 @@
 export OS_CXXFLAGS :=
 
-export OS_LDFLAGS  :=
+export OS_LDFLAGS  := 
 
 export OS_SOURCES  :=

pjproject/branches/symbian/build/rules.mak

@@ -71 +71 @@
         @echo LIBDIR=$(LIBDIR)
 
+#$(LIB): $(LIBDIR) $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
+#       $(AR)$(LIB) $(OBJS)
+#       $(RANLIB) $(LIB)
+        
 $(LIB): $(LIBDIR) $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
-        $(AR)$(LIB) $(OBJS)
-        $(RANLIB) $(LIB)
+        $(LD) $(LDOUT)$(subst /,$(HOST_PSEP),$(LIB)) -search \
+            $(subst /,$(HOST_PSEP),$(OBJS)) $($(APP)_LDFLAGS)
 
 $(EXE): $(BINDIR) $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)