Fix:projs/CodeBlocks:use GTK_DIR environement variable in coinfig files

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

diff --git a/projs/CodeBlocks/Navit.cbp b/projs/CodeBlocks/Navit.cbp
index 17a0d66..0f71051 100644 (file)
--- a/projs/CodeBlocks/Navit.cbp
+++ b/projs/CodeBlocks/Navit.cbp
@@ -71,21 +71,21 @@
                        <Add option="-mms-bitfields" />
                        <Add option="-DMODULE=Navit" />
                        <Add option='-DPREFIX=\&quot;/usr/local\&quot;' />
-                       <Add directory="D:\gtk\include" />
-                       <Add directory="D:\gtk\include\gtk-2.0" />
-                       <Add directory="D:\gtk\include\glib-2.0" />
-                       <Add directory="D:\gtk\lib\gtk-2.0\include" />
-                       <Add directory="D:\gtk\lib\glib-2.0\include" />
-                       <Add directory="D:\gtk\include\cairo" />
-                       <Add directory="D:\gtk\include\pango-1.0" />
-                       <Add directory="D:\gtk\include\atk-1.0" />
+                       <Add directory="%GTK_DIR%\include" />
+                       <Add directory="%GTK_DIR%\include\gtk-2.0" />
+                       <Add directory="%GTK_DIR%\include\glib-2.0" />
+                       <Add directory="%GTK_DIR%\lib\gtk-2.0\include" />
+                       <Add directory="%GTK_DIR%\lib\glib-2.0\include" />
+                       <Add directory="%GTK_DIR%\include\cairo" />
+                       <Add directory="%GTK_DIR%\include\pango-1.0" />
+                       <Add directory="%GTK_DIR%\include\atk-1.0" />
                        <Add directory="..\..\src" />
                        <Add directory="Win32Extra" />
                        <Add directory="..\..\src\fib-1.1" />
                        <Add directory="D:\msys\1.10\freetype-2.3.5\include" />
                </Compiler>
                <Linker>
-                       <Add directory="d:\gtk\lib" />
+                       <Add directory="%GTK_DIR%\lib" />
                        <Add directory="D:\msys\1.10\freetype-2.3.5\objs\.libs" />
                </Linker>
                <Unit filename="Win32Extra\builtin.c">
@@ -272,3 +272,4 @@
                </Extensions>
        </Project>
 </CodeBlocks_project_file>
+\0
\ No newline at end of file

diff --git a/projs/CodeBlocks/Navit.new.cbp b/projs/CodeBlocks/Navit.new.cbp
index 5391153..826ea6e 100644 (file)
--- a/projs/CodeBlocks/Navit.new.cbp
+++ b/projs/CodeBlocks/Navit.new.cbp
@@ -38,14 +38,14 @@
                        <Add option="-mms-bitfields" />
                        <Add option="-DMODULE=Navit" />
                        <Add option='-DPREFIX=\&quot;/usr/local\&quot;' />
-                       <Add directory="D:\gtk\include" />
-                       <Add directory="D:\gtk\include\gtk-2.0" />
-                       <Add directory="D:\gtk\include\glib-2.0" />
-                       <Add directory="D:\gtk\lib\gtk-2.0\include" />
-                       <Add directory="D:\gtk\lib\glib-2.0\include" />
-                       <Add directory="D:\gtk\include\cairo" />
-                       <Add directory="D:\gtk\include\pango-1.0" />
-                       <Add directory="D:\gtk\include\atk-1.0" />
+                       <Add directory="%GTK_DIR%\include" />
+                       <Add directory="%GTK_DIR%\include\gtk-2.0" />
+                       <Add directory="%GTK_DIR%\include\glib-2.0" />
+                       <Add directory="%GTK_DIR%\lib\gtk-2.0\include" />
+                       <Add directory="%GTK_DIR%\lib\glib-2.0\include" />
+                       <Add directory="%GTK_DIR%\include\cairo" />
+                       <Add directory="%GTK_DIR%\include\pango-1.0" />
+                       <Add directory="%GTK_DIR%\include\atk-1.0" />
                        <Add directory="..\..\src" />
                        <Add directory="Win32Extra" />
                        <Add directory="..\..\src\fib-1.1" />
@@ -67,7 +67,7 @@
                        <Add library="glib-2.0" />
                        <Add library="intl" />
                        <Add library="bin\Debug\libvehicle_file.la" />
-                       <Add directory="d:\gtk\lib" />
+                       <Add directory="%GTK_DIR%\lib" />
                        <Add directory="D:\msys\1.10\freetype-2.3.5\objs\.libs" />
                </Linker>
                <Unit filename="Win32Extra\config.h" />

diff --git a/projs/CodeBlocks/Navit.workspace b/projs/CodeBlocks/Navit.workspace
index ded1d38..de7473a 100644 (file)
--- a/projs/CodeBlocks/Navit.workspace
+++ b/projs/CodeBlocks/Navit.workspace
@@ -6,11 +6,11 @@
                <Project filename="data_poi_geodownload.cbp">
                        <Depends filename="mdb.cbp" />
                </Project>
-               <Project filename="binfile.cbp" />
+               <Project filename="binfile.cbp" active="1" />
                <Project filename="vehicle_demo.cbp" />
                <Project filename="vehicle_file.cbp" />
                <Project filename="Osm2Navit.cbp" />
-               <Project filename="Navit.cbp" active="1">
+               <Project filename="Navit.cbp">
                        <Depends filename="fib-1.1.cbp" />
                        <Depends filename="mdb.cbp" />
                        <Depends filename="data_poi_geodownload.cbp" />

diff --git a/projs/CodeBlocks/NavitCommonLib.cbp b/projs/CodeBlocks/NavitCommonLib.cbp
index 726e46c..a410141 100644 (file)
--- a/projs/CodeBlocks/NavitCommonLib.cbp
+++ b/projs/CodeBlocks/NavitCommonLib.cbp
@@ -36,15 +36,15 @@
                        <Add option="-Wall" />
                        <Add option="-mms-bitfields" />
                        <Add option='-DMODULE=\&quot;Navit\&quot;' />
-                       <Add directory="D:\gtk\include\glib-2.0" />
-                       <Add directory="D:\gtk\lib\glib-2.0\include" />
+                       <Add directory="%GTK_DIR%\include\glib-2.0" />
+                       <Add directory="%GTK_DIR%\lib\glib-2.0\include" />
                        <Add directory="Win32Extra" />
-                       <Add directory="D:\gtk\include" />
+                       <Add directory="%GTK_DIR%\include" />
                </Compiler>
                <Linker>
                        <Add library="glib-2.0" />
                        <Add library="z" />
-                       <Add directory="d:\gtk\lib" />
+                       <Add directory="%GTK_DIR%\lib" />
                </Linker>
                <Unit filename="Win32Extra\setenv.c">
                        <Option compilerVar="CC" />

diff --git a/projs/CodeBlocks/Navit_no_plugin.cbp b/projs/CodeBlocks/Navit_no_plugin.cbp
index bd7cb0d..35f5412 100644 (file)
--- a/projs/CodeBlocks/Navit_no_plugin.cbp
+++ b/projs/CodeBlocks/Navit_no_plugin.cbp
@@ -39,14 +39,14 @@
                        <Add option="-Wall" />
                        <Add option="-DBUILD_DLL" />
                        <Add option='-DMODULE=\&quot;Navit\&quot;' />
-                       <Add directory="D:\gtk\include" />
-                       <Add directory="D:\gtk\include\gtk-2.0" />
-                       <Add directory="D:\gtk\include\glib-2.0" />
-                       <Add directory="D:\gtk\lib\gtk-2.0\include" />
-                       <Add directory="D:\gtk\lib\glib-2.0\include" />
-                       <Add directory="D:\gtk\include\cairo" />
-                       <Add directory="D:\gtk\include\pango-1.0" />
-                       <Add directory="D:\gtk\include\atk-1.0" />
+                       <Add directory="%GTK_DIR%\include" />
+                       <Add directory="%GTK_DIR%\include\gtk-2.0" />
+                       <Add directory="%GTK_DIR%\include\glib-2.0" />
+                       <Add directory="%GTK_DIR%\lib\gtk-2.0\include" />
+                       <Add directory="%GTK_DIR%\lib\glib-2.0\include" />
+                       <Add directory="%GTK_DIR%\include\cairo" />
+                       <Add directory="%GTK_DIR%\include\pango-1.0" />
+                       <Add directory="%GTK_DIR%\include\atk-1.0" />
                        <Add directory="..\..\src" />
                        <Add directory="Win32Extra" />
                </Compiler>
@@ -58,7 +58,7 @@
                        <Add library="gdk_pixbuf-2.0" />
                        <Add library="glib-2.0" />
                        <Add library="intl" />
-                       <Add directory="d:\gtk\lib" />
+                       <Add directory="%GTK_DIR%\lib" />
                </Linker>
                <Unit filename="main.cpp" />
                <Unit filename="main.h" />

diff --git a/projs/CodeBlocks/Osm2Navit.cbp b/projs/CodeBlocks/Osm2Navit.cbp
index ab5218d..ae69bea 100644 (file)
--- a/projs/CodeBlocks/Osm2Navit.cbp
+++ b/projs/CodeBlocks/Osm2Navit.cbp
@@ -18,7 +18,7 @@
                                        <Add option="-g" />
                                </Compiler>
                                <Linker>
-                                       <Add directory="d:\gtk\lib" />
+                                       <Add directory="%GTK_DIR%\lib" />
                                        <Add directory="bin\Debug" />
                                </Linker>
                        </Target>
@@ -32,7 +32,7 @@
                                </Compiler>
                                <Linker>
                                        <Add option="-s" />
-                                       <Add directory="d:\gtk\lib" />
+                                       <Add directory="%GTK_DIR%\lib" />
                                        <Add directory="bin\Release" />
                                </Linker>
                        </Target>
@@ -40,9 +40,9 @@
                <Compiler>
                        <Add option="-Wall" />
                        <Add option="-mms-bitfields -DMODULE=osm2navit" />
-                       <Add directory="D:\gtk\include\glib-2.0" />
-                       <Add directory="D:\gtk\lib\glib-2.0\include" />
-                       <Add directory="D:\gtk\include" />
+                       <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" />
                </Compiler>
                <Linker>
@@ -58,7 +58,7 @@
                        <Add library="glib-2.0" />
                        <Add library="intl" />
                        <Add library="zdll" />
-                       <Add directory="d:\gtk\lib" />
+                       <Add directory="%GTK_DIR%\lib" />
                </Linker>
                <Unit filename="Win32Extra\wordexp.c">
                        <Option compilerVar="CC" />

diff --git a/projs/CodeBlocks/binfile.cbp b/projs/CodeBlocks/binfile.cbp
index c4e531a..ce2afb3 100644 (file)
--- a/projs/CodeBlocks/binfile.cbp
+++ b/projs/CodeBlocks/binfile.cbp
@@ -17,7 +17,7 @@
                                        <Add option="-g" />
                                </Compiler>
                                <Linker>
-                                       <Add directory="d:\gtk\lib" />
+                                       <Add directory="%GTK_DIR%\lib" />
                                        <Add directory="bin\Debug" />
                                </Linker>
                        </Target>
@@ -33,18 +33,18 @@
                                </Compiler>
                                <Linker>
                                        <Add option="-s" />
-                                       <Add directory="d:\gtk\lib" />
+                                       <Add directory="%GTK_DIR%\lib" />
                                        <Add directory="bin\Release" />
                                </Linker>
                        </Target>
                </Build>
                <Compiler>
                        <Add option="-Wall" />
-                       <Add option="-mms-bitfields `pkg-config --cflags --libs glib-2.0`" />
+                       <Add option="-mms-bitfields" />
                        <Add option="-DBUILD_DLL" />
                        <Add option="-DMODULE=data_binfile" />
-                       <Add directory="D:\gtk\include\glib-2.0" />
-                       <Add directory="D:\gtk\lib\glib-2.0\include" />
+                       <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\" />
@@ -57,7 +57,7 @@
                        <Add library="user32" />
                        <Add library="intl" />
                        <Add library="iconv" />
-                       <Add directory="d:\gtk\lib" />
+                       <Add directory="%GTK_DIR%\lib" />
                </Linker>
                <Unit filename="..\..\src\data\binfile\binfile.c">
                        <Option compilerVar="CC" />

diff --git a/projs/CodeBlocks/data_poi_geodownload.cbp b/projs/CodeBlocks/data_poi_geodownload.cbp
index d8e5447..5f6ec58 100644 (file)
--- a/projs/CodeBlocks/data_poi_geodownload.cbp
+++ b/projs/CodeBlocks/data_poi_geodownload.cbp
@@ -17,7 +17,7 @@
                                        <Add option="-g" />
                                </Compiler>
                                <Linker>
-                                       <Add directory="d:\gtk\lib" />
+                                       <Add directory="%GTK_DIR%\lib" />
                                        <Add directory="bin\Debug" />
                                </Linker>
                        </Target>
@@ -33,18 +33,18 @@
                                </Compiler>
                                <Linker>
                                        <Add option="-s" />
-                                       <Add directory="d:\gtk\lib" />
+                                       <Add directory="%GTK_DIR%\lib" />
                                        <Add directory="bin\Release" />
                                </Linker>
                        </Target>
                </Build>
                <Compiler>
                        <Add option="-Wall" />
-                       <Add option="-mms-bitfields `pkg-config --cflags --libs glib-2.0`" />
+                       <Add option="-mms-bitfields" />
                        <Add option="-DBUILD_DLL" />
                        <Add option="-DMODULE=data_poi_geodownload" />
-                       <Add directory="D:\gtk\include\glib-2.0" />
-                       <Add directory="D:\gtk\lib\glib-2.0\include" />
+                       <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\" />
@@ -57,7 +57,7 @@
                        <Add library="user32" />
                        <Add library="intl" />
                        <Add library="iconv" />
-                       <Add directory="d:\gtk\lib" />
+                       <Add directory="%GTK_DIR%\lib" />
                </Linker>
                <Unit filename="..\..\src\data\poi_geodownload\poi_geodownload.c">
                        <Option compilerVar="CC" />

diff --git a/projs/CodeBlocks/gtk_graphics.cbp b/projs/CodeBlocks/gtk_graphics.cbp
index cf597e5..bab98c6 100644 (file)
--- a/projs/CodeBlocks/gtk_graphics.cbp
+++ b/projs/CodeBlocks/gtk_graphics.cbp
@@ -17,7 +17,7 @@
                                        <Add option="-g" />
                                </Compiler>
                                <Linker>
-                                       <Add directory="d:\gtk\lib" />
+                                       <Add directory="%GTK_DIR%\lib" />
                                        <Add directory="bin\Debug" />
                                </Linker>
                        </Target>
@@ -33,24 +33,24 @@
                                </Compiler>
                                <Linker>
                                        <Add option="-s" />
-                                       <Add directory="d:\gtk\lib" />
+                                       <Add directory="%GTK_DIR%\lib" />
                                        <Add directory="bin\Release" />
                                </Linker>
                        </Target>
                </Build>
                <Compiler>
                        <Add option="-Wall" />
-                       <Add option="-mms-bitfields `pkg-config --cflags --libs glib-2.0`" />
+                       <Add option="-mms-bitfields" />
                        <Add option="-DBUILD_DLL" />
                        <Add option="-DMODULE=gtk_graphics" />
-                       <Add directory="D:\gtk\include" />
-                       <Add directory="D:\gtk\include\gtk-2.0" />
-                       <Add directory="D:\gtk\include\glib-2.0" />
-                       <Add directory="D:\gtk\lib\gtk-2.0\include" />
-                       <Add directory="D:\gtk\lib\glib-2.0\include" />
-                       <Add directory="D:\gtk\include\cairo" />
-                       <Add directory="D:\gtk\include\pango-1.0" />
-                       <Add directory="D:\gtk\include\atk-1.0" />
+                       <Add directory="%GTK_DIR%\include" />
+                       <Add directory="%GTK_DIR%\include\gtk-2.0" />
+                       <Add directory="%GTK_DIR%\include\glib-2.0" />
+                       <Add directory="%GTK_DIR%\lib\gtk-2.0\include" />
+                       <Add directory="%GTK_DIR%\lib\glib-2.0\include" />
+                       <Add directory="%GTK_DIR%\include\cairo" />
+                       <Add directory="%GTK_DIR%\include\pango-1.0" />
+                       <Add directory="%GTK_DIR%\include\atk-1.0" />
                        <Add directory="..\..\src" />
                        <Add directory="Win32Extra" />
                </Compiler>
@@ -60,7 +60,7 @@
                        <Add library="user32" />
                        <Add library="intl" />
                        <Add library="iconv" />
-                       <Add directory="d:\gtk\lib" />
+                       <Add directory="%GTK_DIR%\lib" />
                </Linker>
                <Unit filename="..\..\src\graphics\gtk_drawing_area\graphics_gtk_drawing_area.c">
                        <Option compilerVar="CC" />

diff --git a/projs/CodeBlocks/gtk_gui.cbp b/projs/CodeBlocks/gtk_gui.cbp
index a681e56..e077dc7 100644 (file)
--- a/projs/CodeBlocks/gtk_gui.cbp
+++ b/projs/CodeBlocks/gtk_gui.cbp
@@ -17,7 +17,7 @@
                                        <Add option="-g" />
                                </Compiler>
                                <Linker>
-                                       <Add directory="d:\gtk\lib" />
+                                       <Add directory="%GTK_DIR%\lib" />
                                        <Add directory="bin\Debug" />
                                </Linker>
                        </Target>
@@ -33,29 +33,29 @@
                                </Compiler>
                                <Linker>
                                        <Add option="-s" />
-                                       <Add directory="d:\gtk\lib" />
+                                       <Add directory="%GTK_DIR%\lib" />
                                        <Add directory="bin\Release" />
                                </Linker>
                        </Target>
                </Build>
                <Compiler>
                        <Add option="-Wall" />
-                       <Add option="-mms-bitfields `pkg-config --cflags --libs glib-2.0`" />
+                       <Add option="-mms-bitfields" />
                        <Add option="-DBUILD_DLL" />
                        <Add option="-DMODULE=gtk_gui" />
-                       <Add directory="D:\gtk\include" />
-                       <Add directory="D:\gtk\include\gtk-2.0" />
-                       <Add directory="D:\gtk\include\glib-2.0" />
-                       <Add directory="D:\gtk\lib\gtk-2.0\include" />
-                       <Add directory="D:\gtk\lib\glib-2.0\include" />
-                       <Add directory="D:\gtk\include\cairo" />
-                       <Add directory="D:\gtk\include\pango-1.0" />
-                       <Add directory="D:\gtk\include\atk-1.0" />
+                       <Add directory="%GTK_DIR%\include" />
+                       <Add directory="%GTK_DIR%\include\gtk-2.0" />
+                       <Add directory="%GTK_DIR%\include\glib-2.0" />
+                       <Add directory="%GTK_DIR%\lib\gtk-2.0\include" />
+                       <Add directory="%GTK_DIR%\lib\glib-2.0\include" />
+                       <Add directory="%GTK_DIR%\include\cairo" />
+                       <Add directory="%GTK_DIR%\include\pango-1.0" />
+                       <Add directory="%GTK_DIR%\include\atk-1.0" />
                        <Add directory="..\..\src" />
                        <Add directory="Win32Extra" />
                </Compiler>
                <Linker>
-                       <Add directory="d:\gtk\lib" />
+                       <Add directory="%GTK_DIR%\lib" />
                </Linker>
                <Unit filename="..\..\src\gui\gtk\datawindow.c">
                        <Option compilerVar="CC" />

diff --git a/projs/CodeBlocks/gui_sdl.cbp b/projs/CodeBlocks/gui_sdl.cbp
index 61bce83..d567657 100644 (file)
--- a/projs/CodeBlocks/gui_sdl.cbp
+++ b/projs/CodeBlocks/gui_sdl.cbp
@@ -17,7 +17,7 @@
                                        <Add option="-g" />
                                </Compiler>
                                <Linker>
-                                       <Add directory="d:\gtk\lib" />
+                                       <Add directory="%GTK_DIR%\lib" />
                                        <Add directory="bin\Debug" />
                                </Linker>
                        </Target>
@@ -33,30 +33,30 @@
                                </Compiler>
                                <Linker>
                                        <Add option="-s" />
-                                       <Add directory="d:\gtk\lib" />
+                                       <Add directory="%GTK_DIR%\lib" />
                                        <Add directory="bin\Release" />
                                </Linker>
                        </Target>
                </Build>
                <Compiler>
                        <Add option="-Wall" />
-                       <Add option="-mms-bitfields `pkg-config --cflags --libs glib-2.0`" />
+                       <Add option="-mms-bitfields" />
                        <Add option="-DBUILD_DLL" />
                        <Add option="-DMODULE=gui_sdl" />
-                       <Add directory="D:\gtk\include" />
-                       <Add directory="D:\gtk\include\gtk-2.0" />
-                       <Add directory="D:\gtk\include\glib-2.0" />
-                       <Add directory="D:\gtk\lib\gtk-2.0\include" />
-                       <Add directory="D:\gtk\lib\glib-2.0\include" />
-                       <Add directory="D:\gtk\include\cairo" />
-                       <Add directory="D:\gtk\include\pango-1.0" />
-                       <Add directory="D:\gtk\include\atk-1.0" />
+                       <Add directory="%GTK_DIR%\include" />
+                       <Add directory="%GTK_DIR%\include\gtk-2.0" />
+                       <Add directory="%GTK_DIR%\include\glib-2.0" />
+                       <Add directory="%GTK_DIR%\lib\gtk-2.0\include" />
+                       <Add directory="%GTK_DIR%\lib\glib-2.0\include" />
+                       <Add directory="%GTK_DIR%\include\cairo" />
+                       <Add directory="%GTK_DIR%\include\pango-1.0" />
+                       <Add directory="%GTK_DIR%\include\atk-1.0" />
                        <Add directory="..\..\src" />
                        <Add directory="Win32Extra" />
                        <Add directory="D:\msys\local\include" />
                </Compiler>
                <Linker>
-                       <Add directory="d:\gtk\lib" />
+                       <Add directory="%GTK_DIR%\lib" />
                </Linker>
                <Unit filename="..\..\src\gui\sdl\Makefile.am" />
                <Unit filename="..\..\src\gui\sdl\Makefile.in" />

diff --git a/projs/CodeBlocks/mdb.cbp b/projs/CodeBlocks/mdb.cbp
index a723def..9b7fb5c 100644 (file)
--- a/projs/CodeBlocks/mdb.cbp
+++ b/projs/CodeBlocks/mdb.cbp
@@ -35,7 +35,7 @@
                </Build>
                <Compiler>
                        <Add option="-Wall" />
-                       <Add option="-mms-bitfields `pkg-config --cflags --libs glib-2.0`" />
+                       <Add option="-mms-bitfields" />
                        <Add directory="..\..\src\data\poi_geodownload\libmdb\include" />
                </Compiler>
                <Unit filename="..\..\src\data\poi_geodownload\libmdb\backend.c">

diff --git a/projs/CodeBlocks/vehicle_demo.cbp b/projs/CodeBlocks/vehicle_demo.cbp
index 7755a8a..6700652 100644 (file)
--- a/projs/CodeBlocks/vehicle_demo.cbp
+++ b/projs/CodeBlocks/vehicle_demo.cbp
@@ -17,7 +17,7 @@
                                        <Add option="-g" />
                                </Compiler>
                                <Linker>
-                                       <Add directory="d:\gtk\lib" />
+                                       <Add directory="%GTK_DIR%\lib" />
                                        <Add directory="bin\Debug" />
                                </Linker>
                        </Target>
@@ -33,18 +33,18 @@
                                </Compiler>
                                <Linker>
                                        <Add option="-s" />
-                                       <Add directory="d:\gtk\lib" />
+                                       <Add directory="%GTK_DIR%\lib" />
                                        <Add directory="bin\Release" />
                                </Linker>
                        </Target>
                </Build>
                <Compiler>
                        <Add option="-Wall" />
-                       <Add option="-mms-bitfields `pkg-config --cflags --libs glib-2.0`" />
+                       <Add option="-mms-bitfields" />
                        <Add option="-DBUILD_DLL" />
                        <Add option="-DMODULE=vehicle_demo" />
-                       <Add directory="D:\gtk\include\glib-2.0" />
-                       <Add directory="D:\gtk\lib\glib-2.0\include" />
+                       <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\" />
@@ -56,7 +56,7 @@
                        <Add library="user32" />
                        <Add library="intl" />
                        <Add library="iconv" />
-                       <Add directory="d:\gtk\lib" />
+                       <Add directory="%GTK_DIR%\lib" />
                </Linker>
                <Unit filename="..\..\src\vehicle\demo\vehicle_demo.c">
                        <Option compilerVar="CC" />

diff --git a/projs/CodeBlocks/vehicle_file.cbp b/projs/CodeBlocks/vehicle_file.cbp
index 5d86259..55c3d04 100644 (file)
--- a/projs/CodeBlocks/vehicle_file.cbp
+++ b/projs/CodeBlocks/vehicle_file.cbp
@@ -17,7 +17,7 @@
                                        <Add option="-g" />
                                </Compiler>
                                <Linker>
-                                       <Add directory="d:\gtk\lib" />
+                                       <Add directory="%GTK_DIR%\lib" />
                                        <Add directory="bin\Debug" />
                                </Linker>
                        </Target>
@@ -33,18 +33,18 @@
                                </Compiler>
                                <Linker>
                                        <Add option="-s" />
-                                       <Add directory="d:\gtk\lib" />
+                                       <Add directory="%GTK_DIR%\lib" />
                                        <Add directory="bin\Release" />
                                </Linker>
                        </Target>
                </Build>
                <Compiler>
                        <Add option="-Wall" />
-                       <Add option="-mms-bitfields `pkg-config --cflags --libs glib-2.0`" />
+                       <Add option="-mms-bitfields" />
                        <Add option="-DBUILD_DLL" />
                        <Add option="-DMODULE=vehicle_file" />
-                       <Add directory="D:\gtk\include\glib-2.0" />
-                       <Add directory="D:\gtk\lib\glib-2.0\include" />
+                       <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\" />
@@ -56,7 +56,7 @@
                        <Add library="user32" />
                        <Add library="intl" />
                        <Add library="iconv" />
-                       <Add directory="d:\gtk\lib" />
+                       <Add directory="%GTK_DIR%\lib" />
                </Linker>
                <Unit filename="..\..\src\vehicle\file\vehicle_file.c">
                        <Option compilerVar="CC" />