Skip to content

Commit 81a6b61

Browse files
author
Homme Zwaagstra
committed
Enable building on Windows 8.1 64bit
This incorporates changes suggested in issue #14.
1 parent 3aa1ff3 commit 81a6b61

File tree

5 files changed

+14
-9
lines changed

5 files changed

+14
-9
lines changed

WINDOWS-INSTALL.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Node Mapserv on Windows
22

33
Although Windows is not currently an officially supported platform for Node
4-
Mapserv, the module has been successfully built on Windows by the team at
5-
mapgears.com. The related
6-
[GitHub issue](https://github.com/geo-data/node-mapserv/issues/7) provides a
7-
discussion point for general Windows issues.
4+
Mapserv, the module has been successfully built on Windows. The related GitHub
5+
issues ([#7](https://github.com/geo-data/node-mapserv/issues/7) and
6+
[#14](https://github.com/geo-data/node-mapserv/issues/14)) provide further
7+
details on building with Windows.
88

99
## Installation
1010

binding.gyp

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"<(ms_buildkit)/include/"
4848
],
4949
"libraries" : [
50-
'<(ms_root)/mapserver_i.lib',
50+
'<(ms_root)/mapserver.lib',
5151
'<(ms_buildkit)/lib/gdal_i.lib',
5252
'<(ms_buildkit)/lib/agg.lib',
5353
'<(ms_buildkit)/lib/cairo.lib',
@@ -60,7 +60,7 @@
6060
'<(ms_buildkit)/lib/ftgl.lib',
6161
'<(ms_buildkit)/lib/gd.lib',
6262
'<(ms_buildkit)/lib/gdal_i.lib',
63-
'<(ms_buildkit)/lib/geos_c_i.lib',
63+
'<(ms_buildkit)/lib/geos_c.lib',
6464
'<(ms_buildkit)/lib/giflib.lib',
6565
'<(ms_buildkit)/lib/hdf5dll.lib',
6666
'<(ms_buildkit)/lib/iconv.lib',

src/error.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Handle<Value> MapserverError::toV8Error() {
102102

103103
// Represent the error stack linked list as an array
104104
MapserverError *error = next;
105-
uint i = 0;
105+
unsigned int i = 0;
106106
Local<Array> errorStack = Array::New(length-1);
107107
while (error) {
108108
Handle<Value> exception = ToV8Error(error);

src/error.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class MapserverError {
103103
/// The previous error in the error stack
104104
MapserverError *next;
105105
/// The number of errors in this error stack
106-
uint length;
106+
unsigned int length;
107107

108108
/// Instantiate a bare bones error: populate it later
109109
MapserverError() :

src/node-mapserv.cpp

+6-1
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,16 @@ extern "C" {
115115
// set).
116116
signal(SIGHUP, msCleanup);
117117
signal(SIGINT, msCleanup);
118+
#ifdef SIGQUIT
118119
signal(SIGQUIT, msCleanup);
120+
#endif
119121
signal(SIGTERM, msCleanup);
122+
#ifdef SIGUSR1
120123
signal(SIGUSR1, msCleanup);
124+
#endif
125+
#ifdef SIGUSR2
121126
signal(SIGUSR2, msCleanup);
122-
127+
#endif
123128
atexit(cleanup); // clean up on normal exit
124129
}
125130
}

0 commit comments

Comments
 (0)