Merge pull request firemodels#1898 from gforney/master

use icx to build all libraries used by smokeview (Intel makefile entries)
drjfloyd · May 6, 2024 · 55e4117 · 55e4117
2 parents af82544 + 857a4e2
commit 55e4117
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/Build/freeglut3.0.0/Makefile b/Build/freeglut3.0.0/Makefile
@@ -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
@@ -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)
 

diff --git a/Source/glut-3.7.6/Makefile b/Source/glut-3.7.6/Makefile
@@ -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

diff --git a/Source/jpeg-9b/Makefile b/Source/jpeg-9b/Makefile
@@ -9,7 +9,7 @@
 srcdir = .
 
 # The name of your C compiler:
-COMPILER=icc
+COMPILER=icx
 SIZE=-m32
 CC=$(COMPILER) $(SIZE)
 

diff --git a/Source/png-1.6.21/makefile b/Source/png-1.6.21/makefile
@@ -8,7 +8,7 @@ PNGMAJ = 0
 PNGMIN = 1.2.5
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
-COMPILER=icc
+COMPILER=icx
 SIZE=-m32
 CC=$(COMPILER) $(SIZE)
 

diff --git a/Source/pthreads/Makefile b/Source/pthreads/Makefile
@@ -1,4 +1,4 @@
-COMPILER=icc
+COMPILER=icx
 SIZE=-m64
 CC=$(COMPILER) $(SIZE)
 

diff --git a/Source/zlib128/Makefile b/Source/zlib128/Makefile
@@ -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)