Skip to content

Commit b2f57d4

Browse files
author
kyngchaos
committed
apply compilation changes to debug configuration also
git-svn-id: http://svn.osgeo.org/qgis/trunk@10319 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 094ee58 commit b2f57d4

File tree

2 files changed

+23
-37
lines changed

2 files changed

+23
-37
lines changed

‎mac/xcode/Qgis.xcodeproj/project.pbxproj

Lines changed: 22 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -8099,6 +8099,7 @@
80998099
72EBCA640F49DC130016BA3C /* frmVisual.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = frmVisual.py; path = ../../python/plugins/fTools/tools/frmVisual.py; sourceTree = SOURCE_ROOT; };
81008100
72EBCA650F49DC130016BA3C /* frmVisual.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = frmVisual.ui; path = ../../python/plugins/fTools/tools/frmVisual.ui; sourceTree = SOURCE_ROOT; };
81018101
72EBCA660F49DC130016BA3C /* ftools_utils.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = ftools_utils.py; path = ../../python/plugins/fTools/tools/ftools_utils.py; sourceTree = SOURCE_ROOT; };
8102+
72F117AB0F73DB1A00D68564 /* tsstat.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; name = tsstat.pl; path = ../../scripts/tsstat.pl; sourceTree = SOURCE_ROOT; };
81028103
8D0C4E960486CD37000505A6 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
81038104
/* End PBXFileReference section */
81048105

@@ -10932,6 +10933,7 @@
1093210933
7209ED350F39E5D9003DC336 /* qgsloggermig.pl */,
1093310934
7209ED360F39E5D9003DC336 /* remove_non_svn_files.sh */,
1093410935
7209ED370F39E5D9003DC336 /* remove_svn_conflict_files.sh */,
10936+
72F117AB0F73DB1A00D68564 /* tsstat.pl */,
1093510937
7209ED380F39E5D9003DC336 /* update-indent.sh */,
1093610938
7209ED390F39E5D9003DC336 /* update_translations.bat */,
1093710939
7209ED3A0F39E5D9003DC336 /* update_ts_files.sh */,
@@ -14651,7 +14653,6 @@
1465114653
);
1465214654
HEADER_SEARCH_PATHS = (
1465314655
"$(inherited)",
14654-
generated/ui,
1465514656
../../src/gui,
1465614657
../../src/core,
1465714658
../../src/core/composer,
@@ -14818,7 +14819,6 @@
1481814819
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
1481914820
HEADER_SEARCH_PATHS = (
1482014821
"$(inherited)",
14821-
generated/helpviewer,
1482214822
../../src/core,
1482314823
"$(SQLITE_INC)",
1482414824
);
@@ -15511,7 +15511,6 @@
1551115511
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
1551215512
HEADER_SEARCH_PATHS = (
1551315513
"$(inherited)",
15514-
generated/copyrightlabelplugin,
1551515514
../../src/plugins,
1551615515
../../src/plugins/copyrightlabel,
1551715516
../../src/core,
@@ -15529,6 +15528,7 @@
1552915528
"$(QT_LIB_GUI)",
1553015529
);
1553115530
PRODUCT_NAME = copyrightlabelplugin.so;
15531+
TARGET_PLUGINDIR = copyright_label;
1553215532
};
1553315533
name = Debug;
1553415534
};
@@ -15572,7 +15572,6 @@
1557215572
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
1557315573
HEADER_SEARCH_PATHS = (
1557415574
"$(inherited)",
15575-
generated/delimitedtextplugin,
1557615575
../../src/plugins,
1557715576
../../src/plugins/delimited_text,
1557815577
../../src/core,
@@ -15590,6 +15589,7 @@
1559015589
"$(QT_LIB_GUI)",
1559115590
);
1559215591
PRODUCT_NAME = delimitedtextplugin.so;
15592+
TARGET_PLUGINDIR = delimited_text;
1559315593
};
1559415594
name = Debug;
1559515595
};
@@ -15633,8 +15633,6 @@
1563315633
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
1563415634
HEADER_SEARCH_PATHS = (
1563515635
"$(inherited)",
15636-
generated,
15637-
generated/georeferencerplugin,
1563815636
../../src/plugins,
1563915637
../../src/plugins/georeferencer,
1564015638
../../src/core,
@@ -15656,6 +15654,7 @@
1565615654
"$(GDAL_LIB)",
1565715655
);
1565815656
PRODUCT_NAME = georeferencerplugin.so;
15657+
TARGET_PLUGINDIR = georeferencer;
1565915658
};
1566015659
name = Debug;
1566115660
};
@@ -15703,8 +15702,6 @@
1570315702
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
1570415703
HEADER_SEARCH_PATHS = (
1570515704
"$(inherited)",
15706-
generated,
15707-
generated/gpsimporterplugin,
1570815705
../../src/plugins,
1570915706
../../src/plugins/gps_importer,
1571015707
../../src/core,
@@ -15723,6 +15720,7 @@
1572315720
"$(QT_LIB_GUI)",
1572415721
);
1572515722
PRODUCT_NAME = gpsimporterplugin.so;
15723+
TARGET_PLUGINDIR = gps_importer;
1572615724
};
1572715725
name = Debug;
1572815726
};
@@ -15775,9 +15773,6 @@
1577515773
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1 = "GRASS_BASE=\\\"$(GRASS_PREFIX)\\\"";
1577615774
HEADER_SEARCH_PATHS = (
1577715775
"$(inherited)",
15778-
generated,
15779-
generated/ui,
15780-
generated/grassplugin,
1578115776
../../src/plugins,
1578215777
../../src/plugins/grass,
1578315778
../../src/core,
@@ -15786,6 +15781,7 @@
1578615781
../../src/core/symbology,
1578715782
../../src/gui,
1578815783
../../src/providers/grass,
15784+
"$(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
1578915785
"$(GRASS_INC)",
1579015786
"$(GDAL_INC)",
1579115787
"$(PROJ_INC)",
@@ -15806,6 +15802,7 @@
1580615802
"$(GDAL_LIB)",
1580715803
);
1580815804
PRODUCT_NAME = grassplugin.so;
15805+
TARGET_PLUGINDIR = grass;
1580915806
};
1581015807
name = Debug;
1581115808
};
@@ -15870,7 +15867,6 @@
1587015867
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
1587115868
HEADER_SEARCH_PATHS = (
1587215869
"$(inherited)",
15873-
generated/interpolationplugin,
1587415870
../../src/plugins,
1587515871
../../src/plugins/interpolation,
1587615872
../../src/core,
@@ -15889,6 +15885,7 @@
1588915885
"$(QT_LIB_GUI)",
1589015886
);
1589115887
PRODUCT_NAME = interpolationplugin.so;
15888+
TARGET_PLUGINDIR = interpolation;
1589215889
};
1589315890
name = Debug;
1589415891
};
@@ -15933,7 +15930,6 @@
1593315930
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
1593415931
HEADER_SEARCH_PATHS = (
1593515932
"$(inherited)",
15936-
generated/northarrowplugin,
1593715933
../../src/plugins,
1593815934
../../src/plugins/north_arrow,
1593915935
../../src/core,
@@ -15951,6 +15947,7 @@
1595115947
"$(QT_LIB_GUI)",
1595215948
);
1595315949
PRODUCT_NAME = northarrowplugin.so;
15950+
TARGET_PLUGINDIR = north_arrow;
1595415951
};
1595515952
name = Debug;
1595615953
};
@@ -15994,8 +15991,6 @@
1599415991
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
1599515992
HEADER_SEARCH_PATHS = (
1599615993
"$(inherited)",
15997-
generated,
15998-
generated/quickprintplugin,
1599915994
../../src/plugins,
1600015995
../../src/plugins/quick_print,
1600115996
../../src/core,
@@ -16013,6 +16008,7 @@
1601316008
"$(QT_LIB_GUI)",
1601416009
);
1601516010
PRODUCT_NAME = quickprintplugin.so;
16011+
TARGET_PLUGINDIR = quick_print;
1601616012
};
1601716013
name = Debug;
1601816014
};
@@ -16056,7 +16052,6 @@
1605616052
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
1605716053
HEADER_SEARCH_PATHS = (
1605816054
"$(inherited)",
16059-
generated/scalebarplugin,
1606016055
../../src/plugins,
1606116056
../../src/plugins/scale_bar,
1606216057
../../src/core,
@@ -16074,6 +16069,7 @@
1607416069
"$(QT_LIB_GUI)",
1607516070
);
1607616071
PRODUCT_NAME = scalebarplugin.so;
16072+
TARGET_PLUGINDIR = scale_bar;
1607716073
};
1607816074
name = Debug;
1607916075
};
@@ -16117,16 +16113,14 @@
1611716113
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
1611816114
HEADER_SEARCH_PATHS = (
1611916115
"$(inherited)",
16120-
generated,
16121-
generated/spitplugin,
1612216116
../../src/plugins,
1612316117
../../src/plugins/spit,
1612416118
../../src/core,
1612516119
../../src/core/raster,
1612616120
../../src/core/renderer,
1612716121
../../src/core/symbology,
1612816122
../../src/gui,
16129-
generated/ui,
16123+
"$(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
1613016124
../../src/app,
1613116125
"$(PGSQL_INC)",
1613216126
"$(GDAL_INC)",
@@ -16142,6 +16136,7 @@
1614216136
"$(GDAL_LIB)",
1614316137
);
1614416138
PRODUCT_NAME = spitplugin.so;
16139+
TARGET_PLUGINDIR = spit;
1614516140
};
1614616141
name = Debug;
1614716142
};
@@ -16192,18 +16187,15 @@
1619216187
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
1619316188
HEADER_SEARCH_PATHS = (
1619416189
"$(inherited)",
16195-
generated,
16196-
generated/ui,
16197-
generated/wfsplugin,
1619816190
../../src/plugins,
1619916191
../../src/plugins/wfs,
1620016192
../../src/core,
1620116193
../../src/core/raster,
1620216194
../../src/core/renderer,
1620316195
../../src/core/symbology,
1620416196
../../src/gui,
16205-
generated/app,
1620616197
../../src/app,
16198+
"$(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
1620716199
"$(GEOS_INC)",
1620816200
);
1620916201
LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)";
@@ -16216,6 +16208,7 @@
1621616208
"$(QT_LIB_XML)",
1621716209
);
1621816210
PRODUCT_NAME = wfsplugin.so;
16211+
TARGET_PLUGINDIR = wfs;
1621916212
};
1622016213
name = Debug;
1622116214
};
@@ -16264,16 +16257,14 @@
1626416257
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
1626516258
HEADER_SEARCH_PATHS = (
1626616259
"$(inherited)",
16267-
generated,
16268-
generated/ui,
16269-
generated/coordinatecaptureplugin,
1627016260
../../src/plugins,
1627116261
../../src/plugins/coordinate_capture,
1627216262
../../src/core,
1627316263
../../src/core/raster,
1627416264
../../src/core/renderer,
1627516265
../../src/core/symbology,
1627616266
../../src/gui,
16267+
"$(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
1627716268
);
1627816269
LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)";
1627916270
MACH_O_TYPE = mh_bundle;
@@ -16284,6 +16275,7 @@
1628416275
"$(QT_LIB_GUI)",
1628516276
);
1628616277
PRODUCT_NAME = coordinatecaptureplugin.so;
16278+
TARGET_PLUGINDIR = coordinate_capture;
1628716279
};
1628816280
name = Debug;
1628916281
};
@@ -16329,8 +16321,6 @@
1632916321
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
1633016322
HEADER_SEARCH_PATHS = (
1633116323
"$(inherited)",
16332-
generated,
16333-
generated/dxf2shpconverterplugin,
1633416324
../../src/plugins,
1633516325
../../src/plugins/dxf2shp_converter,
1633616326
../../src/core,
@@ -16349,6 +16339,7 @@
1634916339
"$(GDAL_LIB)",
1635016340
);
1635116341
PRODUCT_NAME = dxf2shpconverterplugin.so;
16342+
TARGET_PLUGINDIR = dxf2shp_converter;
1635216343
};
1635316344
name = Debug;
1635416345
};
@@ -16393,8 +16384,6 @@
1639316384
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
1639416385
HEADER_SEARCH_PATHS = (
1639516386
"$(inherited)",
16396-
generated,
16397-
generated/ogrconverterplugin,
1639816387
../../src/plugins,
1639916388
../../src/plugins/ogr_converter,
1640016389
../../src/core,
@@ -16414,6 +16403,7 @@
1641416403
"$(GDAL_LIB)",
1641516404
);
1641616405
PRODUCT_NAME = ogrconverterplugin.so;
16406+
TARGET_PLUGINDIR = ogr_converter;
1641716407
};
1641816408
name = Debug;
1641916409
};
@@ -16459,8 +16449,6 @@
1645916449
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
1646016450
HEADER_SEARCH_PATHS = (
1646116451
"$(inherited)",
16462-
generated,
16463-
generated/plugin,
1646416452
../../src/plugins,
1646516453
../../src/plugins/plugin,
1646616454
../../src/core,
@@ -16478,6 +16466,7 @@
1647816466
"$(QT_LIB_GUI)",
1647916467
);
1648016468
PRODUCT_NAME = plugin.so;
16469+
TARGET_PLUGINDIR = "";
1648116470
};
1648216471
name = Debug;
1648316472
};
@@ -16490,8 +16479,6 @@
1649016479
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
1649116480
HEADER_SEARCH_PATHS = (
1649216481
"$(inherited)",
16493-
generated,
16494-
generated/plugin,
1649516482
../../src/plugins,
1649616483
../../src/plugins/plugin,
1649716484
../../src/core,
@@ -16541,8 +16528,6 @@
1654116528
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
1654216529
HEADER_SEARCH_PATHS = (
1654316530
"$(inherited)",
16544-
generated/ui,
16545-
generated/app,
1654616531
../../src/app,
1654716532
../../src/app/legend,
1654816533
../../src/app/composer,
@@ -16554,6 +16539,7 @@
1655416539
../../src/gui,
1655516540
../../src/python,
1655616541
../../src/plugins,
16542+
"$(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
1655716543
"$(GDAL_INC)",
1655816544
"$(PROJ_INC)",
1655916545
"$(GEOS_INC)",

‎mac/xcode/ReadMe-Developers.rtf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ libqgispython must be in MacOS/lib. Qgis attempts to load it dynamically, with
9393
\
9494
3. Add sources to target\
9595
\
96-
4. Edit target settings:\
96+
4. Edit target settings (make sure to change both Debug and Release configurations):\
9797
\
9898
a. Product Name\
9999
b. Header Search Paths - add extra source folders needed, and config _INC vars\

0 commit comments

Comments
 (0)