Add:projs/CodeBlocks: support SAPI-5 TTS function
authorafaber <afaber@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Sat, 12 Jan 2008 22:38:25 +0000 (22:38 +0000)
committerafaber <afaber@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Sat, 12 Jan 2008 22:38:25 +0000 (22:38 +0000)
git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit@757 ffa7fe5e-494d-0410-b361-a75ebd5db220

projs/CodeBlocks/Navit.cbp
projs/CodeBlocks/Navit.workspace
projs/CodeBlocks/Osm2Navit.cbp
projs/CodeBlocks/Win32Extra/builtin.c
projs/CodeBlocks/Win32Extra/config.h
projs/CodeBlocks/Win32Extra/sys/mman.c
projs/CodeBlocks/Win32Extra/sys/mman.h
projs/CodeBlocks/data_mg.cbp [new file with mode: 0644]
projs/CodeBlocks/gentypes.cbp [new file with mode: 0644]
projs/CodeBlocks/makefile_extra [new file with mode: 0644]

index fcb0757..d0e1ba0 100644 (file)
                                        <Add library="bin\Debug\libdata_poi_geodownload.la" />
                                        <Add library="bin\Debug\libmdb.a" />
                                        <Add library="bin\Debug\libdata_garmin.la" />
+                                       <Add library="bin\Debug\libspeech_speech_dispatcher.la" />
+                                       <Add library="bin\Debug\libdata_mg.la" />
                                        <Add library="libgarmin.a" />
+                                       <Add library="ole32" />
                                        <Add library="user32" />
                                        <Add library="gtk-win32-2.0" />
                                        <Add library="gdk-win32-2.0" />
                                        <Add library="bin\Release\libdata_poi_geodownload.la" />
                                        <Add library="bin\Release\libmdb.a" />
                                        <Add library="bin\Release\libdata_garmin.la" />
+                                       <Add library="bin\Release\libspeech_speech_dispatcher.la" />
+                                       <Add library="bin\Release\libdata_mg.la" />
                                        <Add library="libgarmin.a" />
+                                       <Add library="ole32" />
                                        <Add library="user32" />
                                        <Add library="gtk-win32-2.0" />
                                        <Add library="gdk-win32-2.0" />
                        <Option compilerVar="CC" />
                </Unit>
                <Unit filename="Win32Extra\setenv.h" />
+               <Unit filename="Win32Extra\sys\mman.c">
+                       <Option compilerVar="CC" />
+               </Unit>
+               <Unit filename="Win32Extra\sys\mman.h" />
                <Unit filename="Win32Extra\wordexp.c">
                        <Option compilerVar="CC" />
                </Unit>
index d7ba683..51f6aa2 100644 (file)
@@ -5,6 +5,7 @@
                <Project filename="Osm2Navit.cbp" />
                <Project filename="gentypes.cbp" />
                <Project filename="binfile.cbp" />
+               <Project filename="data_mg.cbp" />
                <Project filename="data_garmin.cbp">
                        <Depends filename="gentypes.cbp" />
                </Project>
@@ -16,6 +17,7 @@
                <Project filename="gtk_graphics.cbp" />
                <Project filename="Navit.cbp" active="1">
                        <Depends filename="fib-1.1.cbp" />
+                       <Depends filename="gentypes.cbp" />
                        <Depends filename="binfile.cbp" />
                        <Depends filename="data_garmin.cbp" />
                        <Depends filename="mdb.cbp" />
                        <Depends filename="vehicle_demo.cbp" />
                        <Depends filename="vehicle_file.cbp" />
                        <Depends filename="gtk_gui.cbp" />
+                       <Depends filename="data_mg.cbp" />
                        <Depends filename="gtk_graphics.cbp" />
+                       <Depends filename="speech_speech_dispatcher.cbp" />
                </Project>
+               <Project filename="speech_speech_dispatcher.cbp" />
        </Workspace>
 </CodeBlocks_workspace_file>
index ae69bea..e9a00f4 100644 (file)
                        <Add library="zdll" />
                        <Add directory="%GTK_DIR%\lib" />
                </Linker>
+               <Unit filename="Win32Extra\sys\mman.c">
+                       <Option compilerVar="CC" />
+               </Unit>
+               <Unit filename="Win32Extra\sys\mman.h" />
                <Unit filename="Win32Extra\wordexp.c">
                        <Option compilerVar="CC" />
                </Unit>
index b849407..e5564ae 100644 (file)
@@ -1,17 +1,21 @@
 extern void module_data_binfile_init(void);
+extern void module_data_mg_init(void);
 extern void module_data_garmin_init(void);
 extern void module_data_poi_geodownload_init(void);
 extern void module_gtk_graphics_init(void);
 extern void module_gtk_gui_init(void);
 extern void module_vehicle_demo_init(void);
 extern void module_vehicle_file_init(void);
+extern void module_speech_speech_dispatcher_init(void);
 extern void builtin_init(void);
 void builtin_init(void) {
        module_data_binfile_init();
+       module_data_mg_init();
     module_data_garmin_init();
        module_data_poi_geodownload_init();
        module_gtk_graphics_init();
        module_gtk_gui_init();
        module_vehicle_demo_init();
        module_vehicle_file_init();
+       module_speech_speech_dispatcher_init();
 }
index 01f6687..019925b 100644 (file)
 #define strtok_r(s,d,p) strtok(s,d)
 
 #define alarm( a )
-#define munmap( a, b )
index eeeda77..b435704 100644 (file)
@@ -1,18 +1,38 @@
 #include <windows.h>
 #include "mman.h"
 
-void * mmap_file_readonly( const char* name )
+void * mmap_readonly_win32( const char* name, long* map_handle_ptr, long* map_file_ptr )
 {
     void * mapped_ptr = NULL;
 
     OFSTRUCT   of;
     HFILE hFile = OpenFile (name, &of, OF_READ);
 
+    *map_file_ptr = (long)hFile;
+    *map_handle_ptr = 0;
+
     if ( hFile != HFILE_ERROR )
     {
-        HANDLE hMapping = CreateFileMapping ( (HANDLE)hFile, NULL, PAGE_READONLY, 0, 0, NULL);
+        HANDLE hMapping = CreateFileMapping( (HANDLE)hFile, NULL, PAGE_READONLY, 0, 0, NULL);
         mapped_ptr = MapViewOfFile(hMapping, FILE_MAP_READ, 0 , 0, 0 );
+        *map_handle_ptr = (long)hMapping;
     }
+
     return mapped_ptr;
 }
 
+void mmap_unmap_win32( void* mem_ptr, long map_handle, long map_file )
+{
+    if ( mem_ptr != NULL )
+    {
+        UnmapViewOfFile( mem_ptr );
+    }
+    if ( map_handle != 0)
+    {
+        CloseHandle( (HANDLE)map_handle );
+    }
+    if ( map_file != 0  )
+    {
+        CloseHandle( (HANDLE)map_file );
+    }
+}
index 8545604..37e59b9 100644 (file)
@@ -1,7 +1,8 @@
-#ifndef _SYS_MAN_H_INCLUDED
-#define        _SYS_MAN_H_INCLUDED
+#ifndef _WIN32_MMAN_H_INCLUDED
+#define        _WIN32_MMAN_H_INCLUDED
 
-void * mmap_file_readonly( const char* name );
+void * mmap_readonly_win32( const char* name, long* map_handle_ptr, long* map_file_ptr );
+void mmap_unmap_win32( void* mem_ptr, long map_handle, long map_file );
 
-#endif /* !_SYS_MAN_H_INCLUDED */
+#endif /* !_WIN32_MMAN_H_INCLUDED */
 
diff --git a/projs/CodeBlocks/data_mg.cbp b/projs/CodeBlocks/data_mg.cbp
new file mode 100644 (file)
index 0000000..edda03a
--- /dev/null
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+       <FileVersion major="1" minor="6" />
+       <Project>
+               <Option title="data_mg" />
+               <Option pch_mode="2" />
+               <Option compiler="gcc" />
+               <Build>
+                       <Target title="Debug">
+                               <Option output=".\bin\Debug\libdata_mg.la" prefix_auto="1" extension_auto="0" />
+                               <Option working_dir="" />
+                               <Option object_output=".\obj\Debug\" />
+                               <Option type="2" />
+                               <Option compiler="gcc" />
+                               <Option createDefFile="1" />
+                               <Compiler>
+                                       <Add option="-g" />
+                               </Compiler>
+                               <Linker>
+                                       <Add directory="%GTK_DIR%\lib" />
+                                       <Add directory="bin\Debug" />
+                               </Linker>
+                       </Target>
+                       <Target title="Release">
+                               <Option output=".\bin\Release\libdata_mg.la" prefix_auto="1" extension_auto="0" />
+                               <Option working_dir="" />
+                               <Option object_output=".\obj\Release\" />
+                               <Option type="2" />
+                               <Option compiler="gcc" />
+                               <Option createDefFile="1" />
+                               <Compiler>
+                                       <Add option="-O2" />
+                               </Compiler>
+                               <Linker>
+                                       <Add option="-s" />
+                                       <Add directory="%GTK_DIR%\lib" />
+                                       <Add directory="bin\Release" />
+                               </Linker>
+                       </Target>
+               </Build>
+               <Compiler>
+                       <Add option="-Wall" />
+                       <Add option="-mms-bitfields" />
+                       <Add option="-DBUILD_DLL" />
+                       <Add option="-DMODULE=data_mg" />
+                       <Add directory="%GTK_DIR%\include\glib-2.0" />
+                       <Add directory="%GTK_DIR%\lib\glib-2.0\include" />
+                       <Add directory="..\..\" />
+                       <Add directory="..\" />
+                       <Add directory="D:\CB_Projects\Navit\src\" />
+                       <Add directory="Win32Extra" />
+                       <Add directory="..\..\src" />
+               </Compiler>
+               <Linker>
+                       <Add library="NavitCommonLib" />
+                       <Add library="glib-2.0" />
+                       <Add library="user32" />
+                       <Add library="intl" />
+                       <Add library="iconv" />
+                       <Add directory="%GTK_DIR%\lib" />
+               </Linker>
+               <Unit filename="..\..\src\data\mg\block.c">
+                       <Option compilerVar="CC" />
+               </Unit>
+               <Unit filename="..\..\src\data\mg\map.c">
+                       <Option compilerVar="CC" />
+               </Unit>
+               <Unit filename="..\..\src\data\mg\mg.h" />
+               <Unit filename="..\..\src\data\mg\poly.c">
+                       <Option compilerVar="CC" />
+               </Unit>
+               <Unit filename="..\..\src\data\mg\street.c">
+                       <Option compilerVar="CC" />
+               </Unit>
+               <Unit filename="..\..\src\data\mg\town.c">
+                       <Option compilerVar="CC" />
+               </Unit>
+               <Unit filename="..\..\src\data\mg\tree.c">
+                       <Option compilerVar="CC" />
+               </Unit>
+               <Extensions>
+                       <code_completion />
+                       <envvars />
+                       <debugger />
+               </Extensions>
+       </Project>
+</CodeBlocks_project_file>
diff --git a/projs/CodeBlocks/gentypes.cbp b/projs/CodeBlocks/gentypes.cbp
new file mode 100644 (file)
index 0000000..46bbfc0
--- /dev/null
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+       <FileVersion major="1" minor="6" />
+       <Project>
+               <Option title="GenTypes" />
+               <Option pch_mode="2" />
+               <Option compiler="gcc" />
+               <Build>
+                       <Target title="Debug">
+                               <Option output="GenTypes" prefix_auto="1" extension_auto="1" />
+                               <Option object_output="obj\GenTypes\Debug\" />
+                               <Option type="1" />
+                               <Option compiler="gcc" />
+                               <Option use_console_runner="0" />
+                               <Option parameters="--input-file=d:\CB_Projects\netherlands.osm --attr-debug-level=0 -k netherlands.bin" />
+                               <Compiler>
+                                       <Add option="-g" />
+                               </Compiler>
+                               <Linker>
+                                       <Add directory="%GTK_DIR%\lib" />
+                                       <Add directory="bin\Debug" />
+                               </Linker>
+                       </Target>
+                       <Target title="Release">
+                               <Option output="GenTypes" prefix_auto="1" extension_auto="1" />
+                               <Option object_output="obj\GenTypes\Release\" />
+                               <Option type="1" />
+                               <Option compiler="gcc" />
+                               <Compiler>
+                                       <Add option="-O2" />
+                               </Compiler>
+                               <Linker>
+                                       <Add option="-s" />
+                                       <Add directory="%GTK_DIR%\lib" />
+                                       <Add directory="bin\Release" />
+                               </Linker>
+                       </Target>
+               </Build>
+               <Compiler>
+                       <Add option="-Wall" />
+                       <Add option="-mms-bitfields -DMODULE=GenTypes" />
+                       <Add directory="%GTK_DIR%\include\glib-2.0" />
+                       <Add directory="%GTK_DIR%\lib\glib-2.0\include" />
+                       <Add directory="%GTK_DIR%\include" />
+                       <Add directory="Win32Extra" />
+                       <Add directory="..\..\src" />
+               </Compiler>
+               <Linker>
+                       <Add library="user32" />
+                       <Add library="gtk-win32-2.0" />
+                       <Add library="gdk-win32-2.0" />
+                       <Add library="gdk_pixbuf-2.0" />
+                       <Add library="freetype" />
+                       <Add library="z" />
+                       <Add library="gobject-2.0" />
+                       <Add library="gmodule-2.0" />
+                       <Add library="glib-2.0" />
+                       <Add library="intl" />
+                       <Add library="zdll" />
+                       <Add directory="%GTK_DIR%\lib" />
+               </Linker>
+               <ExtraCommands>
+                       <Add after="GenTypes.exe ..\..\src\data\garmin\garmintypes.txt ..\..\src\data\garmin\g2nbuiltin.h" />
+               </ExtraCommands>
+               <Unit filename="Win32Extra\wordexp.c">
+                       <Option compilerVar="CC" />
+               </Unit>
+               <Unit filename="Win32Extra\wordexp.h" />
+               <Unit filename="..\..\src\attr.h" />
+               <Unit filename="..\..\src\attr_def.h" />
+               <Unit filename="..\..\src\coord.h" />
+               <Unit filename="..\..\src\country.h" />
+               <Unit filename="..\..\src\data\garmin\gentypes.c">
+                       <Option compilerVar="CC" />
+               </Unit>
+               <Unit filename="..\..\src\debug.h" />
+               <Unit filename="..\..\src\file.h" />
+               <Unit filename="..\..\src\item.h" />
+               <Unit filename="..\..\src\map.h" />
+               <Unit filename="..\..\src\param.h" />
+               <Unit filename="..\..\src\plugin.h" />
+               <Unit filename="..\..\src\transform.h" />
+               <Extensions>
+                       <code_completion />
+                       <envvars />
+                       <debugger />
+               </Extensions>
+       </Project>
+</CodeBlocks_project_file>
diff --git a/projs/CodeBlocks/makefile_extra b/projs/CodeBlocks/makefile_extra
new file mode 100644 (file)
index 0000000..258c2a1
--- /dev/null
@@ -0,0 +1,102 @@
+SRC_GTK_PATH = D:/gtk
+SRC_GTK_BIN_PATH = $(SRC_GTK_PATH)/bin
+SRC_GTK_ETC_PATH = $(SRC_GTK_PATH)/etc
+SRC_GTK_LIB_PATH = $(SRC_GTK_PATH)/lib
+
+SRC_MO_PATH = ./locale
+
+SRC_NAVIT_EXE_PATH = ./bin/release
+SRC_XPM_PATH = ../../src/xpm
+
+DST_PATH = ./distr
+DST_BIN_PATH = $(DST_PATH)/bin
+DST_XPM_PATH = $(DST_BIN_PATH)/xpm
+DST_ETC_PATH = $(DST_PATH)/etc
+DST_LIB_PATH = $(DST_PATH)/lib
+DST_MAP_PATH = $(DST_PATH)/maps
+DST_MO_PATH = $(DST_BIN_PATH)/locale
+
+
+GTK_DLLS =  \
+       freetype6.dll \
+       iconv.dll \
+       intl.dll \
+       libatk-1.0-0.dll \
+       libcairo-2.dll \
+       libfontconfig-1.dll \
+       libfreetype-6.dll \
+       libgdk-win32-2.0-0.dll \
+       libgdk_pixbuf-2.0-0.dll \
+       libglib-2.0-0.dll \
+       libgmodule-2.0-0.dll \
+       libgobject-2.0-0.dll \
+       libgtk-win32-2.0-0.dll \
+       libpango-1.0-0.dll \
+       libpangocairo-1.0-0.dll \
+       libpangoft2-1.0-0.dll \
+       libpangowin32-1.0-0.dll \
+       libpng12.dll \
+       libxml2.dll \
+       zlib1.dll
+
+NAVIT_EXES = navit.exe osm2navit.exe
+
+
+SAMPLE_MAP=osm_bbox_11.3,47.9,11.7,48.2
+
+maps_DATA = $(SAMPLE_MAP).bin
+
+samplemap: $(SAMPLE_MAP).bin
+
+$(SAMPLE_MAP).osm.bz2:
+       echo "Downloading osm sample map"
+       wget -O $(SAMPLE_MAP).osm.bz2.tmp http://navit.sourceforge.net/maps/$(SAMPLE_MAP).osm.bz2
+       mv $(SAMPLE_MAP).osm.bz2.tmp $(SAMPLE_MAP).osm.bz2
+
+$(SAMPLE_MAP).bin: $(SAMPLE_MAP).osm.bz2 ./bin/release/osm2navit.exe
+       echo "Converting osm sample map"
+       cp $(SAMPLE_MAP).osm.bz2 tmp.osm.bz2 ;
+       bunzip2 tmp.osm.bz2;
+       cat  tmp.osm | ./bin/release/osm2navit.exe --attr-debug-level=5 $(SAMPLE_MAP).bin.tmp ;
+       mv $(SAMPLE_MAP).bin.tmp $(SAMPLE_MAP).bin ;
+       rm tmp.osm ;
+
+POFILES = cs.mo es.mo fr.mo nl.mo pl.mo de.mo fi.mo it.mo no.mo
+
+MSGFMT=msgfmt.exe
+
+%.mo:../../po/%.po
+       $(MSGFMT) --check --verbose --statistics --output-file=$@ $< && \
+       mkdir -p ./locale/$(basename $@)/LC_MESSAGES && \
+       mv $@ ./locale/$(basename $@)/LC_MESSAGES/navit.mo
+
+
+locale: $(POFILES)
+locale_clean:
+       rm -Rf locale
+
+distr: $(SAMPLE_MAP).bin $(POFILES)
+       rm -Rf $(DISTR_TARGET_PATH);
+       mkdir -p $(DST_BIN_PATH);
+       mkdir -p $(DST_ETC_PATH);
+       mkdir -p $(DST_LIB_PATH);
+       for i in $(NAVIT_EXES); do \
+               cp $(SRC_NAVIT_EXE_PATH)/$$i $(DST_BIN_PATH)/$$i; \
+       done;
+       for i in $(GTK_DLLS); do \
+               cp $(SRC_GTK_BIN_PATH)/$$i $(DST_BIN_PATH)/$$i; \
+       done;
+       cp -r $(SRC_GTK_ETC_PATH)/* $(DST_ETC_PATH) ;
+       mkdir -p $(DST_LIB_PATH)/gtk-2.0/2.10.0 ;
+       cp -r $(SRC_GTK_LIB_PATH)/gtk-2.0/2.10.0/* $(DST_LIB_PATH)/gtk-2.0/2.10.0 ;
+       mkdir -p $(DST_LIB_PATH)/pango ;        
+       cp -r $(SRC_GTK_LIB_PATH)/pango/* $(DST_LIB_PATH)/pango ;
+       cp ./navit.xml.distr $(DST_BIN_PATH)/navit.xml ;
+       cp ./*.ttf $(DST_BIN_PATH)/ ;
+       mkdir -p $(DST_MAP_PATH) ;
+       cp $(SAMPLE_MAP).bin $(DST_MAP_PATH)/ ;
+       mkdir -p $(DST_XPM_PATH) ;      
+       cp -r $(SRC_XPM_PATH)/*.xpm $(DST_XPM_PATH)/ ; 
+       mkdir -p $(DST_MO_PATH) ;       
+       cp -r $(SRC_MO_PATH)/* $(DST_MO_PATH)/           
+