Opened 11 years ago

Closed 7 years ago

#519 closed task (fixed)

osgeo4w build

Reported by: jef Owned by: grass-dev@…
Priority: major Milestone: 6.4.0
Component: Default Version: svn-develbranch6
Keywords: Cc: martinl
CPU: All Platform: All

Description

attached the modifications I did to my GRASS tree to build for OSGeo4W

Attachments (5)

519.diff (14.1 KB) - added by jef 11 years ago.
mingw_updated.2.diff (3.3 KB) - added by neteler 11 years ago.
patch reduced to outstanding item
mingw_updated.diff (3.3 KB) - added by neteler 11 years ago.
patch reduced to outstanding item
mingw_updated3.diff (1.6 KB) - added by neteler 11 years ago.
patch reduced to outstanding changes
mingw_updated4.diff (683 bytes) - added by neteler 10 years ago.
patch reduced to outstanding issues

Download all attachments as: .zip

Change History (12)

Changed 11 years ago by jef

Attachment: 519.diff added

comment:1 Changed 11 years ago by neteler

CPU: UnspecifiedAll
Platform: UnspecifiedAll

I have merged in the changes from Glynn (mailing list).

Questions: is the NOFILTEROUT=1 stuff needed (see include/Make/Lib.make and lib/gis/Makefile in the path)?

I have taken out in the revised patch:

Index: lib/g3d/g3dmask.c
===================================================================
--- lib/g3d/g3dmask.c   (revision 36200)
+++ lib/g3d/g3dmask.c   (working copy)
@@ -309,12 +309,12 @@
        for (dy = y; dy < rows; dy++) {
            for (dx = x; dx < cols; dx++) {
                G3D_MASKNUM(map, dx, dy, dz, tile, type);
-               tile += length;
+               (unsigned char *)tile += length;
            }

-           tile += xLength;
+           (unsigned char *)tile += xLength;
        }
-       tile += yLength;
+       (unsigned char *)tile += yLength;
     }
 }

since it doesn't compile on Linux (C++ syntax?).

Please review the mingw_updated.diff patch and suggest for lib/g3d/g3dmask.c.

comment:2 Changed 11 years ago by martinl

wxGUI-related part of the patch submitted to devbr6 (http://trac.osgeo.org/grass/changeset/36220). The rest in progress...

Martin

comment:3 Changed 11 years ago by martinl

Cc: martinl added

comment:4 in reply to:  2 Changed 11 years ago by martinl

Replying to martinl:

wxGUI-related part of the patch submitted to devbr6 (http://trac.osgeo.org/grass/changeset/36220). The rest in progress...

Please can someone review unsubmitted part of the patch:

M      raster/Makefile
M      lib/g3d/g3dcache.c
M      lib/g3d/g3dmask.c
M      lib/gis/spawn.c
M      lib/gis/Makefile
M      lib/gis/gdal.c
M      include/Make/Lib.make
M      include/Make/Shlib.make

I don't feel enough familiar with building system in GRASS.

M.

Changed 11 years ago by neteler

Attachment: mingw_updated.2.diff added

patch reduced to outstanding item

Changed 11 years ago by neteler

Attachment: mingw_updated.diff added

patch reduced to outstanding item

comment:5 Changed 11 years ago by neteler

I have reduced the attached patch to the outstanding items except for the lib/g3d/g3dmask.c

part which is only in the original submission. For that, see comment 1 above.

Changed 11 years ago by neteler

Attachment: mingw_updated3.diff added

patch reduced to outstanding changes

comment:6 Changed 11 years ago by neteler

Patch reduced to outstanding items (with modification for raster/Makefile). Left out lib/g3d/g3dmask.c as unclear how to write it correctly (see first comment here). Please test + comment.

The other issues are in 6.4.0svn and 6.5svn now.

Changed 10 years ago by neteler

Attachment: mingw_updated4.diff added

patch reduced to outstanding issues

comment:7 in reply to:  6 Changed 7 years ago by hellik

Resolution: fixed
Status: newclosed

Replying to neteler:

[...]

The other issues are in 6.4.0svn and 6.5svn now.

patches applied and a lot of fixes done in the last months.

closing ticket, reopen if needed.

Helmut

Note: See TracTickets for help on using tickets.