Skip to content

Commit

Permalink
Merge pull request firemodels#1898 from gforney/master
Browse files Browse the repository at this point in the history
use icx to build all libraries used by smokeview (Intel makefile entries)
  • Loading branch information
gforney authored May 6, 2024
2 parents af82544 + 857a4e2 commit 55e4117
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Build/freeglut3.0.0/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

PLATFORM=
SIZE=-m64
COMPILER=icc
COMPILER=icx
CC=$(COMPILER) $(SIZE)

#FILTERC=-D NDEBUG -D FREEGLUT_STATIC -D NEED_XPARSEGEOMETRY_IMPL -D GLUT_DISABLE_ATEXIT_HACK -D _LIB -D FREEGLUT_LIB_PRAGMAS=0
Expand Down Expand Up @@ -54,7 +54,7 @@ OBJSWINS_WIN = $(OBJSWINS:.o=.obj)
# intel linux 64

intel_linux_64 : INC+=-I $(SOURCE_DIR)/x11
intel_linux_64 : CC=icc
intel_linux_64 : CC=icx
intel_linux_64 : $(OBJS)
ar rcs libglut.a $(OBJS)

Expand Down
2 changes: 1 addition & 1 deletion Source/glut-3.7.6/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# For conditions of distribution and use, see copyright notice in png.h

SIZE=-m32
COMPILER=icc
COMPILER=icx
CC=$(COMPILER) $(SIZE)

FILTERC=-Wno-implicit-int -Wno-implicit-function-declaration -Wint-to-pointer-cast
Expand Down
2 changes: 1 addition & 1 deletion Source/jpeg-9b/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
srcdir = .

# The name of your C compiler:
COMPILER=icc
COMPILER=icx
SIZE=-m32
CC=$(COMPILER) $(SIZE)

Expand Down
2 changes: 1 addition & 1 deletion Source/png-1.6.21/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ PNGMAJ = 0
PNGMIN = 1.2.5
PNGVER = $(PNGMAJ).$(PNGMIN)

COMPILER=icc
COMPILER=icx
SIZE=-m32
CC=$(COMPILER) $(SIZE)

Expand Down
2 changes: 1 addition & 1 deletion Source/pthreads/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
COMPILER=icc
COMPILER=icx
SIZE=-m64
CC=$(COMPILER) $(SIZE)

Expand Down
2 changes: 1 addition & 1 deletion Source/zlib128/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# To install in $HOME instead of /usr/local, use:
# make install prefix=$HOME

COMPILER=icc
COMPILER=icx
SIZE=-m64
CC=$(COMPILER)

Expand Down

0 comments on commit 55e4117

Please sign in to comment.