diff options
| author | mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-02-22 19:34:18 +0000 |
|---|---|---|
| committer | mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-02-22 19:34:18 +0000 |
| commit | 7b94d4a21bc7e3e91b166426b40237326d98d6b1 (patch) | |
| tree | c75efb8d12e3288dcc0a8ecbc9075ff74de12e4b /CMakeLists.txt | |
| parent | 4b0e90cecb43d6469118970904e2d1f77d5f30a0 (diff) | |
| download | navit-svn-7b94d4a21bc7e3e91b166426b40237326d98d6b1.tar.gz | |
Fix:core:Don't use #pragma pack just because target platform is Win32/WinCE. This confuses gcc 3.4.5 which is now latest supported gcc by MINGW. Anyway, we use __attribute__ ((packed)) on any GCC for that.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5746 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'CMakeLists.txt')
| -rwxr-xr-x | CMakeLists.txt | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 134ae225..c35b9930 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -518,16 +518,13 @@ if(WIN32 OR WINCE) set(XSLTS "windows;${XSLTS}" CACHE STRING "define a semicolon seperated list of XSLTs to process") endif() if (WIN32 AND NOT WINCE) - set(HAVE_PRAGMA_PACK 1) set(HAVE_API_WIN32 1) set(HAVE_STDINT_H 1) - #set(BUILD_MAPTOOL FALSE) set(SAMPLE_MAP FALSE) list(APPEND NAVIT_LIBS winmm) endif() if(WINCE) add_plugin(support/libc "wince detected" TRUE) - set(HAVE_PRAGMA_PACK 1) set(HAVE_API_WIN32_CE 1) set(BUILD_MAPTOOL FALSE) set_with_reason(vehicle/file "wince: currently broken" FALSE) |