Skip to content
Snippets Groups Projects
Commit 37bf62c9 authored by Adam Borgstrand's avatar Adam Borgstrand
Browse files

Change main file and makefile for loadtexture to work for windows

parent b8cccb7b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Makefile
+ 2
− 2
View file @ 37bf62c9
...@@ -6,8 +6,8 @@ all : linux ...@@ -6,8 +6,8 @@ all : linux
linux : main.cpp $(commondir)GL_utilities.c $(commondir)LoadTGA.c $(commondir)Linux/MicroGlut.c LoadTexture.c 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 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 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 -lopengl32 -lgdi32 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 : clean :
rm main rm main
main deleted 100644 → 0
+ 0
− 0
View file @ b8cccb7b
File deleted
main.cpp
+ 1
− 1
View file @ 37bf62c9
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include "VectorUtils4.h" #include "VectorUtils4.h"
#include "LittleOBJLoader.h" #include "LittleOBJLoader.h"
#include "LoadTGA.h" #include "LoadTGA.h"
#include "../LoadTexture-with-demo/LoadTexture.h" #include "LoadTexture.h"
#else #else
#endif #endif
......
main.exe 0 → 100644
+ 0
− 0
View file @ 37bf62c9
File added
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment