sitä sun tätä tekeillä, toimii kivasti

1 files changed, 7 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index c8912d1ff..979631fc0 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # It's usually sufficient to change just the target name and source file list

 # and be sure that CXX is set to a valid compiler

 TARGET = test

-SOURCE_FILES = mapblockobject.cpp inventory.cpp debug.cpp serialization.cpp light.cpp filesys.cpp connection.cpp environment.cpp client.cpp server.cpp socket.cpp mapblock.cpp mapsector.cpp heightmap.cpp map.cpp player.cpp utility.cpp main.cpp test.cpp

+SOURCE_FILES = voxel.cpp mapblockobject.cpp inventory.cpp debug.cpp serialization.cpp light.cpp filesys.cpp connection.cpp environment.cpp client.cpp server.cpp socket.cpp mapblock.cpp mapsector.cpp heightmap.cpp map.cpp player.cpp utility.cpp main.cpp test.cpp

 SOURCES = $(addprefix src/, $(SOURCE_FILES))

 OBJECTS = $(SOURCES:.cpp=.o)

 FASTTARGET = fasttest

@@ -13,7 +13,7 @@ JTHREADPATH = ../jthread/jthread-1.2.1
 CPPFLAGS = -I$(IRRLICHTPATH)/include -I/usr/X11R6/include -I$(JTHREADPATH)/src

 

 #CXXFLAGS = -O2 -ffast-math -Wall -fomit-frame-pointer -pipe

-CXXFLAGS = -O2 -ffast-math -Wall -g

+CXXFLAGS = -O2 -ffast-math -Wall -g -pipe

 #CXXFLAGS = -O1 -ffast-math -Wall -g

 #CXXFLAGS = -Wall -g -O0

 

@@ -21,8 +21,8 @@ CXXFLAGS = -O2 -ffast-math -Wall -g
 #CXXFLAGS = -O3 -ffast-math -Wall -g

 #CXXFLAGS = -O2 -ffast-math -Wall -g

 

-#FASTCXXFLAGS = -O3 -ffast-math -Wall -fomit-frame-pointer -pipe -funroll-loops -mtune=pentium3

-FASTCXXFLAGS = -O3 -ffast-math -Wall -fomit-frame-pointer -pipe -funroll-loops -mtune=i686

+#FASTCXXFLAGS = -O3 -ffast-math -Wall -fomit-frame-pointer -pipe -funroll-loops -mtune=i686

+FASTCXXFLAGS = -O3 -ffast-math -Wall -fomit-frame-pointer -pipe -funroll-loops -mtune=i686 -fwhole-program

 

 #Default target

 

@@ -53,7 +53,9 @@ all_linux all_win32: $(DESTPATH)
 fast_linux: $(FASTDESTPATH)

 

 $(FASTDESTPATH): $(SOURCES)

-	$(CXX) -o $(FASTDESTPATH) $(SOURCES) $(CPPFLAGS) $(FASTCXXFLAGS) $(LDFLAGS) -DUNITTEST_DISABLE

+	@#$(CXX) -o $(FASTDESTPATH) $(SOURCES) $(CPPFLAGS) $(FASTCXXFLAGS) $(LDFLAGS) -DUNITTEST_DISABLE

+	@# Errno doesn't work ("error: ‘__errno_location’ was not declared in this scope")

+	cat $(SOURCES) | $(CXX) -o $(FASTDESTPATH) -x c++ - -Isrc/ $(CPPFLAGS) $(FASTCXXFLAGS) $(LDFLAGS) -DUNITTEST_DISABLE -DDISABLE_ERRNO

 

 $(DESTPATH): $(OBJECTS)

 	$(CXX) -o $@ $(OBJECTS) $(LDFLAGS)