diff --git a/.appveyor.yml b/.appveyor.yml index 0692b0db..cc1d0545 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -34,11 +34,7 @@ build_script: copy pkg\%NSI% installer - copy pkg\ellipsoids.csv installer - - copy pkg\gcs.csv installer - - copy pkg\pcs.csv installer + copy pkg\csv installer /i xcopy pkg\maps installer\maps /i diff --git a/gpxsee.pro b/gpxsee.pro index 1a82237c..86a99bf7 100644 --- a/gpxsee.pro +++ b/gpxsee.pro @@ -220,6 +220,8 @@ macx { lang/gpxsee_fr.qm \ lang/gpxsee_ru.qm \ lang/gpxsee_sv.qm + CSV.path = Contents/Resources + CSV.files = pkg/csv MAPS.path = Contents/Resources MAPS.files = pkg/maps ICONS.path = Contents/Resources/icons @@ -228,10 +230,6 @@ macx { icons/fit.icns \ icons/igc.icns \ icons/nmea.icns - CSV.path = Contents/Resources - CSV.files = pkg/ellipsoids.csv \ - pkg/gcs.csv \ - pkg/pcs.csv QMAKE_BUNDLE_DATA += LOCALE MAPS ICONS CSV } win32 { diff --git a/pkg/ellipsoids.csv b/pkg/csv/ellipsoids.csv similarity index 100% rename from pkg/ellipsoids.csv rename to pkg/csv/ellipsoids.csv diff --git a/pkg/gcs.csv b/pkg/csv/gcs.csv similarity index 100% rename from pkg/gcs.csv rename to pkg/csv/gcs.csv diff --git a/pkg/pcs.csv b/pkg/csv/pcs.csv similarity index 100% rename from pkg/pcs.csv rename to pkg/csv/pcs.csv diff --git a/pkg/gpxsee.nsi b/pkg/gpxsee.nsi index 07d3015c..fbfad153 100644 --- a/pkg/gpxsee.nsi +++ b/pkg/gpxsee.nsi @@ -84,9 +84,7 @@ Section "GPXSee" SEC_APP ; Put the files there File "gpxsee.exe" File /r "maps" - File "ellipsoids.csv" - File "gcs.csv" - File "pcs.csv" + File /r "csv" ; Create start menu entry and add links SetShellVarContext all diff --git a/pkg/gpxsee64.nsi b/pkg/gpxsee64.nsi index 3d58a593..28e77748 100644 --- a/pkg/gpxsee64.nsi +++ b/pkg/gpxsee64.nsi @@ -91,9 +91,7 @@ Section "GPXSee" SEC_APP ; Put the files there File "gpxsee.exe" File /r "maps" - File "ellipsoids.csv" - File "gcs.csv" - File "pcs.csv" + File /r "csv" ; Create start menu entry and add links SetShellVarContext all diff --git a/src/config.h b/src/config.h index 640a9953..97bafefe 100644 --- a/src/config.h +++ b/src/config.h @@ -12,9 +12,9 @@ #define FONT_FAMILY "Arial" #define FONT_SIZE 12 // px -#define ELLIPSOID_FILE QString("ellipsoids.csv") -#define GCS_FILE QString("gcs.csv") -#define PCS_FILE QString("pcs.csv") +#define ELLIPSOID_FILE QString("csv/ellipsoids.csv") +#define GCS_FILE QString("csv/gcs.csv") +#define PCS_FILE QString("csv/pcs.csv") #define MAP_DIR QString("maps") #define POI_DIR QString("POI")