diff --git a/Makefile b/Makefile index 8bde9d7..c67aba7 100755 --- a/Makefile +++ b/Makefile @@ -13,10 +13,11 @@ ifdef COMSPEC # windows - CXX := C:/g++ - CXXFLAGS := -Wall -I $(INCLUDEDIR) - LIBS := + CXX := g++ + CXXFLAGS := -Wall -I$(INCLUDEDIR) -Ic:/SDL/include + LIBS := -Lc:/SDL/lib -lmingw32 -lSDLmain -lopengl32 -lglu32 -mwindows EXESUFFIX := .exe + POSTLIBS := -lSDL -lopengl32 -lglu32 MKDIR := mkdir -p ECHO := echo @@ -27,6 +28,7 @@ CXXFLAGS := -DUNIX -Wall `sdl-config --cflags` -I $(INCLUDEDIR) LIBS := `sdl-config --libs` -lGL -lGLU EXESUFFIX := + POSTLIBS := RM := rm -f ECHO := echo @@ -43,7 +45,7 @@ @if [ ! -d $(BINDIR) ]; then \ $(call run,$(MKDIR) $(BINDIR)); \ fi - $(CXX) $(CXXFLAGS) $(LIBS) $^ -o $(BINDIR)/$(PROGNAME)$(EXESUFFIX) + $(CXX) $(CXXFLAGS) $(LIBS) $^ -o $(BINDIR)/$(PROGNAME)$(EXESUFFIX) $(POSTLIBS) run: $(BINDIR)/$(PROGNAME)$(EXESUFFIX) clean: diff --git a/sources/main.cpp b/sources/main.cpp index dd9534a..4f9e78c 100755 --- a/sources/main.cpp +++ b/sources/main.cpp @@ -15,7 +15,7 @@ #endif #include // This file import the SDL inteface -#include // This file import the SDL inteface +//#include // This file import the SDL inteface #include // This file import the OpenGL interface #include // This file offers some OpenGL-related utilities @@ -30,18 +30,18 @@ #include -#ifndef UNIX +//#ifndef UNIX ///////////// // #PRAGMA // ///////////// // Visual Studio specific: you can import libraries directly by // specifing them through a #pragma. On other compilters/platforms add // the required .lib to the makefile or project proprieties -#pragma comment(lib, "opengl32.lib") -#pragma comment(lib, "glu32.lib") -#pragma comment(lib, "sdl.lib") -#pragma comment(lib, "sdlmain.lib") -#endif +//#pragma comment(lib, "opengl32.lib") +//#pragma comment(lib, "glu32.lib") +//#pragma comment(lib, "sdl.lib") +//#pragma comment(lib, "sdlmain.lib") +//#endif #include "vec.h" #include "color.h" @@ -481,7 +481,7 @@ //////////////// // Swap buffers: - usleep(2000); // Just don't kill computer resources ;) + //TODO: usleep(2000); // Just don't kill computer resources ;) SDL_GL_SwapBuffers(); // Plain stupid log, just to show values: @@ -512,7 +512,7 @@ //////////////// // Swap buffers: - usleep(2000); // Just don't kill computer resources ;) + //TODO usleep(2000); // Just don't kill computer resources ;) SDL_GL_SwapBuffers(); // Plain stupid log, just to show values: