From 3f90c7246a036326515127d5b87633e17eec04b0 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 6 Feb 2001 11:21:48 +0000
Subject: [PATCH] *** empty log message ***
---
Common/Timer.cpp | 16 ++++++++++------
Makefile | 14 +++++++-------
2 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/Common/Timer.cpp b/Common/Timer.cpp
index b9e49823e7..5f14096f4a 100644
--- a/Common/Timer.cpp
+++ b/Common/Timer.cpp
@@ -1,13 +1,17 @@
-#ifndef WIN32
+#if defined(WIN32) && !defined(__CYGWIN__)
+
+long GetTime(){
+ return 0;
+}
+
+#else
+
#include <sys/time.h>
#include <unistd.h>
long GetTime(){
struct timeval tp;
- gettimeofday(&tp, (struct timezone *) 0);
+ gettimeofday(&tp, (struct timezone *)0);
return (long)tp.tv_sec * 1000000 + (long)tp.tv_usec;
}
-#else
-long GetTime(){
- return 0;
-}
+
#endif
diff --git a/Makefile b/Makefile
index 30b59a8515..363b023a07 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.50 2001-02-06 07:52:51 geuzaine Exp $
+# $Id: Makefile,v 1.51 2001-02-06 11:21:48 geuzaine Exp $
# ----------------------------------------------------------------------
# Makefile for Gmsh
# ----------------------------------------------------------------------
@@ -15,8 +15,8 @@
-I$(HOME)/SOURCES/Mesa-3.1/include\
-I$(HOME)/SOURCES/Mesa-3.1/include/GL
MOTIF_INC = -I/usr/X11R6/LessTif/Motif1.2/include
- FLTK_INC = -I$(HOME)/SOURCES/fltk
- FLTK_INC_SCOREC = -I/users/develop/develop/visual/fltk/1.0/include
+ FLTK_INC = -I$(HOME)/SOURCES/fltk
+ FLTK_INC_SCOREC = -I/users/develop/develop/visual/fltk/1.0/include
OPENGL_LIB = -lGLU -lGL
OPENGL_MOTIF_LIB = -lGLw
@@ -25,14 +25,14 @@
MESA_STATIC_LIB = $(HOME)/SOURCES/Mesa-static/lib/libGLU.a\
$(HOME)/SOURCES/Mesa-static/lib/libGL.a
MESA_MOTIF_STATIC_LIB = $(HOME)/SOURCES/Mesa-static/lib/libGLw.a
- XMOTIF_LIB = /usr/local/lib/libXm.so.2 -L/usr/X11R6/lib -lXt -lX11 -lXext
-# XMOTIF_LIB = -L/usr/local/lib -L/usr/X11R6/LessTif/Motif1.2/lib -lXm\
+ XMOTIF_LIB = /usr/local/lib/libXm.so.2 -L/usr/X11R6/lib -lXt -lX11 -lXext
+# XMOTIF_LIB = -L/usr/local/lib -L/usr/X11R6/LessTif/Motif1.2/lib -lXm\
-L/usr/X11R6/lib -lXt -lX11 -lXext
FLTK_LIB = -L$(HOME)/SOURCES/fltk/lib -lfltk\
-L/usr/X11R6/lib -lXext -lX11
- FLTK_LIB_SOLARIS_SCOREC = /users/develop/develop/visual/fltk/1.0/lib/sun4_5/libfltk-gcc.a\
+FLTK_LIB_SOLARIS_SCOREC = /users/develop/develop/visual/fltk/1.0/lib/sun4_5/libfltk-gcc.a\
-L/usr/X11R6/lib -lXext -lX11
- FLTK_LIB_LINUX_SCOREC = /users/develop/develop/visual/fltk/1.0/lib/x86_linux/libfltk.a\
+FLTK_LIB_LINUX_SCOREC = /users/develop/develop/visual/fltk/1.0/lib/x86_linux/libfltk.a\
-L/usr/X11R6/lib -lXext -lX11
THREAD_LIB = -L/usr/lib -lpthread
--
GitLab