From 57da377728f100ec1f1d336a2a3e091996dcb925 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 13 Apr 2013 06:45:17 +0000
Subject: [PATCH] fix compile
---
CMakeLists.txt | 2 +-
Common/GamePad.cpp | 2 ++
Mesh/meshPartition.cpp | 4 ++++
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 559db10cbc..0deb996519 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -962,7 +962,7 @@ if(MSVC)
endif(MSVC)
if(WIN32 OR CYGWIN)
- list(APPEND EXTERNAL_LIBRARIES wsock32 ws2_32)
+ list(APPEND EXTERNAL_LIBRARIES winmm wsock32 ws2_32)
endif(WIN32 OR CYGWIN)
# disable compile optimization on some known problematic files
diff --git a/Common/GamePad.cpp b/Common/GamePad.cpp
index 27c3e392fc..59953698d2 100644
--- a/Common/GamePad.cpp
+++ b/Common/GamePad.cpp
@@ -64,6 +64,8 @@ GamePad::GamePad() : active(false), frequency(.01), gamepad_fd(0) {
#if defined(WIN32)
+ return; // FIXME the gamepad code crashes
+
for (int i = JOYSTICKID1 ; i < JOYSTICKID2 ; i++) {
if(JOYERR_NOERROR == joyGetDevCaps(i, &caps, sizeof(JOYCAPS)) ) {
/*
diff --git a/Mesh/meshPartition.cpp b/Mesh/meshPartition.cpp
index 1b846a3104..921965d399 100644
--- a/Mesh/meshPartition.cpp
+++ b/Mesh/meshPartition.cpp
@@ -31,6 +31,10 @@
//--Prototype for Chaco interface
+#ifdef interface
+#undef interface
+#endif
+
extern "C" int interface
(int nvtxs, int *start, int *adjacency, int *vwgts, float *ewgts,
float *x, float *y, float *z,
--
GitLab