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
b5b14eeb
Commit
b5b14eeb
authored
16 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
*** empty log message ***
parent
250127bf
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Fltk/Win32Icon.h
+1
-3
1 addition, 3 deletions
Fltk/Win32Icon.h
utils/misc/variables.msvc
+9
-5
9 additions, 5 deletions
utils/misc/variables.msvc
with
10 additions
and
8 deletions
Fltk/Win32Icon.h
+
1
−
3
View file @
b5b14eeb
#define IDI_ICON 101
#define IDI_ICON 101
This diff is collapsed.
Click to expand it.
utils/misc/variables.msvc
+
9
−
5
View file @
b5b14eeb
...
...
@@ -9,10 +9,10 @@
##################################################################
# Specify where gmake is installed
MAKE=C:\
msys\1.0\home\Administrator\src\gmsh
\gmake.exe
MAKE=C:\
src\gmsh\utils\misc
\gmake.exe
# Change the following to select which version to build:
ENABLE_GUI=
0
ENABLE_GUI=
1
ENABLE_PARSER=1
ENABLE_POSTPRO=1
ENABLE_TETGEN=1
...
...
@@ -20,10 +20,10 @@ ENABLE_NETGEN=0
ENABLE_OCC=0
# If you selected ENABLE_GUI, specify where FLTK is installed
FLTK_PREFIX=C:\
msys\1.0\home\Administrator\
src\fltk-1.1.9
FLTK_PREFIX=C:\src\fltk-1.1.9
# If you selected ENABLE_OCC, specify where OpenCASCADE is insalled
OCC_PREFIX=C:\OpenCASCADE6.3.0\ros
OCC_PREFIX=C:\
src\
OpenCASCADE6.3.0\ros
##################################################################
...
...
@@ -58,6 +58,8 @@ LINKER=cl /F16777216
FLAGS=/DWIN32 /D_USE_MATH_DEFINES /DHAVE_NO_DLL /DHAVE_NO_SOCKLEN_T
FLAGS+=/DHAVE_ANN /DHAVE_MATH_EVAL
FLAGS+=/D_CRT_SECURE_NO_DEPRECATE
# Additional system includes ($INCLUDE is automatically defined by MSVC when
# you launch the MSVC command prompt)
SYSINCLUDE=/I"${INCLUDE}"
...
...
@@ -97,8 +99,10 @@ ifeq (${ENABLE_GUI},1)
GMSH_DIRS+=Graphics Fltk
FLAGS+=/DHAVE_FLTK /I"${FLTK_PREFIX}"
GMSH_LIBS+=Fltk/Main.obj lib/*.lib lib/*.lib ${FLTK_PREFIX}\lib\fltk*.lib
GMSH_LIBS+=glu32.lib opengl32.lib advapi32.lib gdi32.lib user32.lib shell32.lib ole32.lib uuid.lib comctl32.lib
GMSH_LIBS+=glu32.lib opengl32.lib advapi32.lib gdi32.lib user32.lib
GMSH_LIBS+=shell32.lib ole32.lib uuid.lib comctl32.lib
GMSH_LIBS+=wsock32.lib winspool.lib ws2_32.lib Fltk/Win32Icon.res
GMSH_LIBS+=/link /NODEFAULTLIB:libcmt.lib
else
GMSH_LIBS=Common/Main.obj lib/*.lib
endif
...
...
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