diff --git a/Makefile b/Makefile index 8c3701c9d6d93a30b855b47bd46e2fbc9292544d..fce739a66d3ec3ea508a061a70013b5eb462a967 100644 --- a/Makefile +++ b/Makefile @@ -6,8 +6,8 @@ all : linux linux : main.cpp $(commondir)GL_utilities.c $(commondir)LoadTGA.c $(commondir)Linux/MicroGlut.c LoadTexture.c g++ -Wall -o main -I$(commondir) -I common/Linux -DGL_GLEXT_PROTOTYPES main.cpp $(commondir)GL_utilities.c $(commondir)LoadTGA.c $(commondir)Linux/MicroGlut.c LoadTexture.c -lXt -lX11 -lGL -lm -lz -windows : main.cpp $(commondir)GL_utilities.c $(commondir)LoadTGA.c $(commondir)Windows/MicroGlut.c $(commondir)Windows/glew.c - g++ -Wall -o main -I$(commondir) -I common/Windows -DGL_GLEXT_PROTOTYPES main.cpp $(commondir)GL_utilities.c $(commondir)LoadTGA.c $(commondir)Windows/MicroGlut.c $(commondir)Windows/glew.c -lopengl32 -lgdi32 +windows : main.cpp $(commondir)GL_utilities.c $(commondir)LoadTGA.c $(commondir)Windows/MicroGlut.c $(commondir)Windows/glew.c LoadTexture.c + g++ -Wall -o main -I$(commondir) -I common/Windows -DGL_GLEXT_PROTOTYPES main.cpp $(commondir)GL_utilities.c $(commondir)LoadTGA.c $(commondir)Windows/MicroGlut.c $(commondir)Windows/glew.c LoadTexture.c -lopengl32 -lgdi32 -lz clean : rm main diff --git a/main b/main deleted file mode 100644 index 02c378767719f17b8bf327401a9b792d0e8a7a0b..0000000000000000000000000000000000000000 Binary files a/main and /dev/null differ diff --git a/main.cpp b/main.cpp index 978005575cf2f9ead167cc4d6b6dc43cd22d3ee0..4e02134bfbdae407b843c721c64276a4afdeaa3c 100644 --- a/main.cpp +++ b/main.cpp @@ -15,7 +15,7 @@ #include "VectorUtils4.h" #include "LittleOBJLoader.h" #include "LoadTGA.h" - #include "../LoadTexture-with-demo/LoadTexture.h" + #include "LoadTexture.h" #else #endif diff --git a/main.exe b/main.exe new file mode 100644 index 0000000000000000000000000000000000000000..cbe1fabd4c49d73cb27c96ea988e5f34ff858b5f Binary files /dev/null and b/main.exe differ