PalmOS 6 compilation fixes (patch 1849757)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-15 01:25:56 +00:00
parent 7379e47609
commit e2fc40b478
43 changed files with 1688 additions and 393 deletions
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -288,6 +288,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/palmos/dir.cpp
    src/palmos/prefconf.cpp
    src/palmos/snglinst.cpp
+    src/palmos/stdall.c
    src/palmos/thread.cpp
    src/palmos/utils.cpp
    src/palmos/utilsexc.cpp
@@ -303,6 +304,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/palmos/apptrait.h
    wx/palmos/chkconf.h
    wx/palmos/mimetype.h
+    wx/palmos/missing.h
    wx/palmos/stdpaths.h
 </set>

--- a/build/msw/config.vc
+++ b/build/msw/config.vc
@@ -32,7 +32,7 @@ LDFLAGS =
 CPP = $(CC) /EP /nologo

 # What type of library to build? [0,1]
-SHARED = 0
+SHARED = 1

 # Build wxUniversal instead of native port? [0,1]
 WXUNIV = 0
--- a/build/palmos/.cdtproject
+++ b/build/palmos/.cdtproject
@@ -1,22 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse-cdt version="2.0"?>
+
 <cdtproject id="org.eclipse.cdt.make.core.make">
-    <extension id="org.eclipse.cdt.make.core.MakeScannerProvider" point="org.eclipse.cdt.core.ScannerInfoProvider"/>
-    <extension id="org.eclipse.cdt.core.Elf" point="org.eclipse.cdt.core.BinaryParser"/>
-    <data>
-        <item id="org.eclipse.cdt.make.core.makeScannerInfo">
-            <includePath path="$(SDK6_LOCATION)headers"/>
-            <includePath path="$(SDK6_LOCATION)headers\EntryNums"/>
-            <includePath path="$(SDK6_LOCATION)headers\posix"/>
-            <includePath path="$(SDK6_LOCATION)headers\posix\arm"/>
-            <includePath path="$(SDK6_LOCATION)headers\posix\arpa"/>
-            <includePath path="$(SDK6_LOCATION)headers\posix\machine"/>
-            <includePath path="$(SDK6_LOCATION)headers\posix\machine\arm"/>
-            <includePath path="$(SDK6_LOCATION)headers\posix\machine\x86"/>
-            <includePath path="$(SDK6_LOCATION)headers\posix\net"/>
-            <includePath path="$(SDK6_LOCATION)headers\posix\netinet"/>
-            <includePath path="$(SDK6_LOCATION)headers\posix\sys"/>
-            <includePath path="$(SDK6_LOCATION)headers\streams"/>
-            <definedSymbol symbol="__arm__"/>
-        </item>
-    </data>
+<extension point="org.eclipse.cdt.core.BinaryParser" id="org.eclipse.cdt.core.PE"/>
+<data>
+        
+    <item id="org.eclipse.cdt.core.pathentry">
+<pathentry kind="src" path=""/>
+<pathentry kind="out" path=""/>
+<pathentry kind="mac" path="" name="__arm__" value="1"/>
+<pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/>
+</item>
+</data>
 </cdtproject>
--- a/build/palmos/.project
+++ b/build/palmos/.project
@@ -29,25 +29,29 @@
 					<value>1</value>
 				</dictionary>
 				<dictionary>
-					<key>SDK</key>
-					<value>com.palmsource.eclipse.sdk.palmos6</value>
+					<key>PROJECT_VERSION</key>
+					<value>10100</value>
 				</dictionary>
 				<dictionary>
 					<key>DB_RESET_INSTALL</key>
 					<value>false</value>
 				</dictionary>
 				<dictionary>
-					<key>APP_NAME</key>
-					<value>wxWidgets</value>
+					<key>SDK</key>
+					<value>com.palmsource.eclipse.sdk.palmos6</value>
 				</dictionary>
 				<dictionary>
-					<key>PROJECT_NAME</key>
+					<key>APP_NAME</key>
 					<value>wxWidgets</value>
 				</dictionary>
 				<dictionary>
 					<key>OS_API</key>
 					<value>Protein</value>
 				</dictionary>
+				<dictionary>
+					<key>PROJECT_NAME</key>
+					<value>wxWidgets</value>
+				</dictionary>
 				<dictionary>
 					<key>PROJECT_TYPE</key>
 					<value>appl</value>
@@ -115,6 +119,47 @@
 				</dictionary>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.make.core.ScannerConfigBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.ScannerConfigDiscoveryEnabled</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.makeBuilderParserId</key>
+					<value>org.eclipse.cdt.make.core.GCCScannerInfoConsoleParser</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.esiProviderCommandEnabled</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.siProblemGenerationEnabled</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.useDefaultESIProviderCmd</key>
+					<value>false</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.makeBuilderParserEnabled</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.esiProviderArguments</key>
+					<value>-E -P -v ${plugin_state_location}/${specs_file}</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.esiProviderParserId</key>
+					<value>org.eclipse.cdt.make.core.GCCSpecsConsoleParser</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.esiProviderCommand</key>
+					<value>gcc</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>com.palmsource.eclipse.palmos6dev.palmOSProteinNature</nature>
@@ -122,5 +167,6 @@
 		<nature>org.eclipse.cdt.core.cnature</nature>
 		<nature>org.eclipse.cdt.make.core.makeNature</nature>
 		<nature>org.eclipse.cdt.core.ccnature</nature>
+		<nature>org.eclipse.cdt.make.core.ScannerConfigNature</nature>
 	</natures>
 </projectDescription>
--- a/build/palmos/auto-generated.mk
+++ b/build/palmos/auto-generated.mk
@@ -7,7 +7,7 @@ endif

 # This value is unescaped.  Either quote the value or escape special characters when you use it.
 ifeq ($(SDK_LOCATION), )
-   SDK_LOCATION = C:/Program Files/PalmSource/Palm OS Developer Suite/sdk-6/
+   SDK_LOCATION = C:/Program Files/PalmSource/Palm OS Developer Suite/sdk-6.1/
 endif

 ifeq ($(SDK_VERSION), )
@@ -34,26 +34,30 @@ ifeq ($(VERSION), )
   VERSION = 1
 endif

-ifeq ($(DB_RESET_INSTALL), )
-   DB_RESET_INSTALL = false
+ifeq ($(PROJECT_VERSION), )
+   PROJECT_VERSION = 10100
 endif

 ifeq ($(SDK), )
   SDK = com.palmsource.eclipse.sdk.palmos6
 endif

+ifeq ($(DB_RESET_INSTALL), )
+   DB_RESET_INSTALL = false
+endif
+
 ifeq ($(APP_NAME), )
   APP_NAME = wxWidgets
 endif

-ifeq ($(OS_API), )
-   OS_API = Protein
-endif
-
 ifeq ($(PROJECT_NAME), )
   PROJECT_NAME = wxWidgets
 endif

+ifeq ($(OS_API), )
+   OS_API = Protein
+endif
+
 ifeq ($(PROJECT_TYPE), )
   PROJECT_TYPE = appl
 endif
--- a/build/palmos/makefile
+++ b/build/palmos/makefile
@@ -10,6 +10,9 @@
 #	2. Review the other settings as needed.
 #
 ## --------------------------------------------------------------------------
+INSTALL=install
+INSTALL_DATA=${INSTALL} -m 644
+INSTALL_DIR=${INSTALL} -d

 SHELL = /bin/sh
 ## conditionally include an auto-generated.mk for dynamic definitions
@@ -42,13 +45,17 @@ PRC_NAME = wxWidgets.prc
 # TODO: Update all sources and resources

 BASE_CMN_SRC = \
+../../src/common/arrstr.cpp \
 ../../src/common/appbase.cpp \
 ../../src/common/archive.cpp \
+../../src/common/btncmn.cpp \
 ../../src/common/clntdata.cpp \
 ../../src/common/cmdline.cpp \
 ../../src/common/config.cpp \
+../../src/common/convauto.cpp \
 ../../src/common/datetime.cpp \
 ../../src/common/datstrm.cpp \
+../../src/common/dcbufcmn.cpp \
 ../../src/common/dircmn.cpp \
 ../../src/common/dynarray.cpp \
 ../../src/common/dynlib.cpp \
@@ -84,15 +91,20 @@ BASE_CMN_SRC = \
 ../../src/common/strconv.cpp \
 ../../src/common/stream.cpp \
 ../../src/common/string.cpp \
+../../src/common/stringimpl.cpp \
+../../src/common/stringops.cpp \
+../../src/common/strvararg.cpp \
 ../../src/common/sysopt.cpp \
 ../../src/common/textbuf.cpp \
 ../../src/common/textfile.cpp \
 ../../src/common/tokenzr.cpp \
 ../../src/common/txtstrm.cpp \
+../../src/common/unichar.cpp \
 ../../src/common/uri.cpp \
 ../../src/common/variant.cpp \
 ../../src/common/wfstream.cpp \
-../../src/common/wxchar.cpp \
+../../src/common/wxcrt.cpp \
+../../src/common/wxprintf.cpp \
 ../../src/common/xti.cpp \
 ../../src/common/xtistrm.cpp \
 ../../src/common/zipstrm.cpp \
@@ -130,6 +142,7 @@ NET_CMN_SRC = \
 ../../src/common/url.cpp

 PALMOS_LOWLEVEL_SRC = \
+../../src/palmos/stdall.c \
 ../../src/palmos/app.cpp \
 ../../src/palmos/bitmap.cpp \
 ../../src/palmos/brush.cpp \
@@ -280,6 +293,7 @@ GUI_CMN_SRC = \
 ../../src/common/settcmn.cpp \
 ../../src/common/sizer.cpp \
 ../../src/common/statbar.cpp \
+../../src/common/stattextcmn.cpp \
 ../../src/common/stockitem.cpp \
 ../../src/common/tbarbase.cpp \
 ../../src/common/textcmn.cpp \
@@ -451,6 +465,9 @@ $(XML_SRC) \
 $(OPENGL_SRC) \
 ../../src/palmos/progdlg.cpp

+#include othersrc.mak
+#SOURCES += $(OTHER_SRC)
+
 RESOURCES = ../../include/wx/palmos/wxWidgets.xrd ../../include/wx/palmos/Version.xrd
 DEFS_FILE = ../../include/wx/palmos/wxWidgets.def
 SLD_FILE = ../../include/wx/palmos/wxWidgets.sld
@@ -500,7 +517,10 @@ DEBUG_OR_RELEASE=Debug
 # Set the target platform for the build; either Device or Simulator
 # Use Device as a target for emulator builds.
 #
-TARGET_PLATFORM=Simulator
+#TARGET_PLATFORM=Simulator
+TARGET_PLATFORM=Device
+
+#TARGET_FORMAT=PalmOS4

 # Specify the level of optimization that you want:
 # NONE, SOME, FULL, INTRAPROCEDURAL, INTERPROCEDURAL, INLINING.
@@ -535,7 +555,8 @@ ADDITIONAL_SIM_LINK_LIBRARIES =
 # Additionally, you must explicly specify the "-I" prior to each
 # path included in this variable.  Spaces are used to separate
 # each path from each other.
-LOCAL_INCLUDE_PATHS = -Irsc -I../../lib/gcc_lib/palmos -I../../include
+incdir=../../lib/gcc_lib/palmos
+LOCAL_INCLUDE_PATHS = -Irsc -I$(incdir) -I../../include
 LOCAL_SIM_INCLUDE_PATHS = $(LOCAL_INCLUDE_PATHS)

 # Additional paths to look for #include <header>
--- a/build/palmos/makefile-engine.mk
+++ b/build/palmos/makefile-engine.mk
@@ -160,7 +160,9 @@ endif
 ###############################################################################
 # Compile and Link Settings

+ifeq ($(TARGET_FORMAT), )
 TARGET_FORMAT=PalmOS6
+endif

 # Compiler settings... compiler + optimizations + debug
 # This is a makefile for Palm OS 6 so the compilers used are as follows:
@@ -428,6 +430,7 @@ SLD_SIM_OBJ := $(addprefix $(SIM_OBJ_DIR)/, $(addsuffix .o, $(SLD_BASENAME)))
 VPATH :=
 VPATH += $(addprefix :, $(subst  ,:, $(filter-out $($(subst, :, ,$(VPATH))), $(SOURCE_PATHS) $(RESOURCE_PATHS) )))

+# -I "$(SDK_LOCATION)include" -I "$(SDK_LOCATION)include/Core/System" #
 SYSTEM_INCLUDES = $(SYSTEM_INCLUDE_PATHS) -I "$(SDK_LOCATION)headers" -I "$(SDK_LOCATION)headers/posix"
 INCLUDES = $(LOCAL_INCLUDE_PATHS) $(foreach path, $(SOURCE_PATHS), $(addprefix -I, $(path))) $(SYSTEM_INCLUDES) $(PRE_INCLUDE_PATHS)
 CPP_INCLUDES = -I "$(TOOLS_DIR)include/stlport"
@@ -602,10 +605,15 @@ $(RSC_OBJ_DIR)/%.trc : %.XRD makefile
 $(SLD_OBJ) : makefile
 	@echo "...Processing definition file for Device..."
 	"$(TOOLS_DIR)pslib" -inDef "$(SLD_FILE)" $(PSLIB_DEV_FLAGS) -outObjStartup $@ -type '$(DB_TYPE)' -creator '$(CREATOR_ID)' -execName $(DATABASE_NAME)
+	$(INSTALL_DIR) $(incdir)/wx/
+	$(INSTALL_DATA) ../../include/wx/palmos/setup0.h $(incdir)/wx/setup.h
+	
 	
 $(SLD_SIM_OBJ) : makefile
 	@echo "...Processing definition file for Simulator..."
 	"$(TOOLS_DIR)pslib" -inDef "$(SLD_FILE)" $(PSLIB_SIM_FLAGS) -outSimStartup $@ -outSimRsrc $(SIM_OBJ_DIR)/acod0000.bin  -outSimDefs $(SIM_OBJ_DIR)/gcc_link.def -type '$(DB_TYPE)' -creator '$(CREATOR_ID)' -execName $(DATABASE_NAME)
+	$(INSTALL_DIR) $(incdir)/wx/
+	$(INSTALL_DATA) ../../include/wx/palmos/setup0.h $(incdir)/wx/setup.h

 # Linking step
 $(LINKER_OUTPUT) : $(OBJS)