Changeset 32642
- Timestamp:
- 2018-11-30T19:42:21+13:00 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/common-src/indexers/packages/windows/iconv/GS-README-VS14-VS2015-AND-LATER.txt
r32637 r32642 11 11 12 12 [ 13 NO NEED FOR STEP 1 13 NO NEED FOR STEP 1, as windows' iconv.zip requires the same changes as the linux gs-libiconv 1.11 tarball to get it to compile on windows anyway: 14 14 15 X 1. Libiconv 1.11 appears to be the last version of the package that can be compiled with Visual Studio. 15 16 Subsequent versions require Mingw and/or Cygwin and won't work easily with our existing GS compile workflow. … … 23 24 ] 24 25 25 2. In the Makefile.msvc files inside gs-libiconv 1.11that are listed below,26 2. In the Makefile.msvc files inside the extracted iconv folder that are listed below, 26 27 change the now syntax error 27 28 … … 30 31 !if "$(DEBUG)" == "1" 31 32 32 ( example ishere:33 (an example of the correct way of doing this was found here: 33 34 https://github.com/adobe/chromium/blob/master/third_party/libxslt/win32/Makefile.msvc) 34 35 … … 41 42 - ./tests/Makefile.msvc 42 43 43 Not sure if other similar instances need similar changes, e.g. !if !$(DLL)44 but theydidn't give rise to syntax errors or GS3 compilation failures, so I left them as is.44 Not sure if other similar instances in Greenstone win make files need similar changes, e.g. !if !$(DLL) 45 but our other win make files didn't give rise to syntax errors or GS3 compilation failures, so I left them as is. 45 46 46 47 … … 79 80 - The solution was indicated at: https://github.com/chansen/p5-time-moment/issues/12 80 81 That new VS compilers had their own stdbool.h where bool was typedefed to some other type with a different size in memory. 81 So we have to use this stdbool.had82 So we have to use VS' stdbool.h instead of iconv.zip's stdbool.h 82 83 83 84 My solution was therefore to get rid of iconv/windows/stdbool.h for the iconv-VS14+ version, 84 to let it find the iconvin VS14+ instead.85 to force it to find the stdbool.h in VS14+ instead. 85 86 So I renamed iconv/windows/stdbool.h to iconv/windows/stdbool.unusable_for_VS14plus 86 87
Note:
See TracChangeset
for help on using the changeset viewer.