Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gmsh
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Larry Price
gmsh
Commits
57da3777
Commit
57da3777
authored
12 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
fix compile
parent
28ea4c77
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
Common/GamePad.cpp
+2
-0
2 additions, 0 deletions
Common/GamePad.cpp
Mesh/meshPartition.cpp
+4
-0
4 additions, 0 deletions
Mesh/meshPartition.cpp
with
7 additions
and
1 deletion
CMakeLists.txt
+
1
−
1
View file @
57da3777
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Common/GamePad.cpp
+
2
−
0
View file @
57da3777
...
@@ -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
))
)
{
/*
/*
...
...
This diff is collapsed.
Click to expand it.
Mesh/meshPartition.cpp
+
4
−
0
View file @
57da3777
...
@@ -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
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment