Fix:projs/CodeBlocks:dependencies & release build

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit@747 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/projs/CodeBlocks/Navit.cbp b/projs/CodeBlocks/Navit.cbp
index 0f71051..e1c28df 100644 (file)
--- a/projs/CodeBlocks/Navit.cbp
+++ b/projs/CodeBlocks/Navit.cbp
@@ -82,7 +82,7 @@
                        <Add directory="..\..\src" />
                        <Add directory="Win32Extra" />
                        <Add directory="..\..\src\fib-1.1" />
-                       <Add directory="D:\msys\1.10\freetype-2.3.5\include" />
+                       <Add directory="%GTK_DIR%\include\freetype2" />
                </Compiler>
                <Linker>
                        <Add directory="%GTK_DIR%\lib" />
@@ -272,4 +272,3 @@
                </Extensions>
        </Project>
 </CodeBlocks_project_file>
-\0
\ No newline at end of file

diff --git a/projs/CodeBlocks/Navit.workspace b/projs/CodeBlocks/Navit.workspace
index de7473a..f7919aa 100644 (file)
--- a/projs/CodeBlocks/Navit.workspace
+++ b/projs/CodeBlocks/Navit.workspace
@@ -2,24 +2,22 @@
 <CodeBlocks_workspace_file>
        <Workspace title="Navit">
                <Project filename="fib-1.1.cbp" />
-               <Project filename="mdb.cbp" />
-               <Project filename="data_poi_geodownload.cbp">
-                       <Depends filename="mdb.cbp" />
-               </Project>
-               <Project filename="binfile.cbp" active="1" />
-               <Project filename="vehicle_demo.cbp" />
-               <Project filename="vehicle_file.cbp" />
                <Project filename="Osm2Navit.cbp" />
-               <Project filename="Navit.cbp">
+               <Project filename="Navit.cbp" active="1">
                        <Depends filename="fib-1.1.cbp" />
+                       <Depends filename="binfile.cbp" />
                        <Depends filename="mdb.cbp" />
                        <Depends filename="data_poi_geodownload.cbp" />
-                       <Depends filename="binfile.cbp" />
                        <Depends filename="vehicle_demo.cbp" />
                        <Depends filename="vehicle_file.cbp" />
                        <Depends filename="gtk_gui.cbp" />
                        <Depends filename="gtk_graphics.cbp" />
                </Project>
+               <Project filename="binfile.cbp" />
+               <Project filename="mdb.cbp" />
+               <Project filename="data_poi_geodownload.cbp" />
+               <Project filename="vehicle_demo.cbp" />
+               <Project filename="vehicle_file.cbp" />
                <Project filename="gtk_gui.cbp" />
                <Project filename="gtk_graphics.cbp" />
        </Workspace>

diff --git a/projs/CodeBlocks/Win32Extra/serial_io.c b/projs/CodeBlocks/Win32Extra/serial_io.c
index 71cb6aa..5192cf7 100644 (file)
--- a/projs/CodeBlocks/Win32Extra/serial_io.c
+++ b/projs/CodeBlocks/Win32Extra/serial_io.c
@@ -2,12 +2,12 @@
 #include <windows.h>
 #include "serial_io.h"
 
-int serial_io_init( int port, int baudrate )
+int serial_io_init( const char* port, const char* strsettings )
 {
     HANDLE hCom = NULL;
 
        char strport[16];
-       snprintf( strport, sizeof( strport ), "\\\\.\\COM%d", port );
+       snprintf( strport, sizeof( strport ), "\\\\.\\%s", port );
 
        hCom = CreateFile(
                        strport,
@@ -33,8 +33,6 @@ int serial_io_init( int port, int baudrate )
                        0,
                        NULL
                );
-               char * tst = lpMsgBuf;
-
                // g_strSerialError = strPort + wxT(": ") + (LPTSTR) lpMsgBuf;
 
                // Free the buffer.
@@ -48,8 +46,8 @@ int serial_io_init( int port, int baudrate )
 
        GetCommState(hCom, &dcb);
 
-    char strsettings[255];
-    snprintf( strsettings, sizeof( strsettings ), "baud=%d parity=N data=8 stop=1", baudrate );
+//    char strsettings[255];
+//    snprintf( strsettings, sizeof( strsettings ), "baud=%d parity=N data=8 stop=1", baudrate );
        BuildCommDCB( strsettings, &dcb);
 
        SetupComm(hCom, 4096, 4096);

diff --git a/projs/CodeBlocks/Win32Extra/serial_io.h b/projs/CodeBlocks/Win32Extra/serial_io.h
index 33ffc55..6ce87d4 100644 (file)
--- a/projs/CodeBlocks/Win32Extra/serial_io.h
+++ b/projs/CodeBlocks/Win32Extra/serial_io.h
@@ -1,12 +1,9 @@
 #ifndef SERIAL_IO_H_INCLUDED
 #define SERIAL_IO_H_INCLUDED
 
-// wxString EnumSerialPort(int n);
-int serial_io_init( int port, int baudrate );
+int serial_io_init( const char* port, const char* strsettings );
 int serio_io_read(int fd, char * buffer, int buffer_size );
 int WriteSerial(int fd, const char * buffer);
 void serial_io_shutdown(int fd );
-// wxString GetLastSerialIOError();
-
 
 #endif

diff --git a/projs/CodeBlocks/gtk_graphics.cbp b/projs/CodeBlocks/gtk_graphics.cbp
index bab98c6..d8571b8 100644 (file)
--- a/projs/CodeBlocks/gtk_graphics.cbp
+++ b/projs/CodeBlocks/gtk_graphics.cbp
@@ -53,6 +53,7 @@
                        <Add directory="%GTK_DIR%\include\atk-1.0" />
                        <Add directory="..\..\src" />
                        <Add directory="Win32Extra" />
+                       <Add directory="%GTK_DIR%\include\freetype2" />
                </Compiler>
                <Linker>
                        <Add library="NavitCommonLib" />

diff --git a/projs/CodeBlocks/mdb.cbp b/projs/CodeBlocks/mdb.cbp
index 9b7fb5c..a972fb4 100644 (file)
--- a/projs/CodeBlocks/mdb.cbp
+++ b/projs/CodeBlocks/mdb.cbp
@@ -37,6 +37,8 @@
                        <Add option="-Wall" />
                        <Add option="-mms-bitfields" />
                        <Add directory="..\..\src\data\poi_geodownload\libmdb\include" />
+                       <Add directory="%GTK_DIR%\include\glib-2.0" />
+                       <Add directory="%GTK_DIR%\lib\glib-2.0\include" />
                </Compiler>
                <Unit filename="..\..\src\data\poi_geodownload\libmdb\backend.c">
                        <Option compilerVar="CC" />