Skip to content
Snippets Groups Projects
Commit 57da3777 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

fix compile

parent 28ea4c77
No related branches found
No related tags found
No related merge requests found
...@@ -962,7 +962,7 @@ if(MSVC) ...@@ -962,7 +962,7 @@ if(MSVC)
endif(MSVC) endif(MSVC)
if(WIN32 OR CYGWIN) if(WIN32 OR CYGWIN)
list(APPEND EXTERNAL_LIBRARIES wsock32 ws2_32) list(APPEND EXTERNAL_LIBRARIES winmm wsock32 ws2_32)
endif(WIN32 OR CYGWIN) endif(WIN32 OR CYGWIN)
# disable compile optimization on some known problematic files # disable compile optimization on some known problematic files
......
...@@ -64,6 +64,8 @@ GamePad::GamePad() : active(false), frequency(.01), gamepad_fd(0) { ...@@ -64,6 +64,8 @@ GamePad::GamePad() : active(false), frequency(.01), gamepad_fd(0) {
#if defined(WIN32) #if defined(WIN32)
return; // FIXME the gamepad code crashes
for (int i = JOYSTICKID1 ; i < JOYSTICKID2 ; i++) { for (int i = JOYSTICKID1 ; i < JOYSTICKID2 ; i++) {
if(JOYERR_NOERROR == joyGetDevCaps(i, &caps, sizeof(JOYCAPS)) ) { if(JOYERR_NOERROR == joyGetDevCaps(i, &caps, sizeof(JOYCAPS)) ) {
/* /*
......
...@@ -31,6 +31,10 @@ ...@@ -31,6 +31,10 @@
//--Prototype for Chaco interface //--Prototype for Chaco interface
#ifdef interface
#undef interface
#endif
extern "C" int interface extern "C" int interface
(int nvtxs, int *start, int *adjacency, int *vwgts, float *ewgts, (int nvtxs, int *start, int *adjacency, int *vwgts, float *ewgts,
float *x, float *y, float *z, float *x, float *y, float *z,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment