diff --git a/NTMakefile b/NTMakefile index 25a8f88880c23a61661627320e4d95fbbcabe66e..4b5267eb82f6a124c76e7617b33819190d367dcc 100644 --- a/NTMakefile +++ b/NTMakefile @@ -34,26 +34,31 @@ endif WARNINGS = -pedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wctor-dtor-privacy -Wdisabled-optimization -Wformat=2 -Winit-self -Wlogical-op -Wmissing-declarations -Wmissing-include-dirs -Wnoexcept -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-conversion -Wsign-promo -Wstrict-null-sentinel -Wstrict-overflow=5 -Wswitch-default -Wundef -Wno-unused -Wzero-as-null-pointer-constant -Wuseless-cast CWARN = -pedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wdisabled-optimization -Wformat=2 -Winit-self -Wlogical-op -Wmissing-declarations -Wmissing-include-dirs -Wredundant-decls -Wshadow -Wsign-conversion -Wstrict-overflow=5 -Wswitch-default -Wundef -Wno-unused -LIBS = -lglfw -lopenGL32 -lGLEW32 -lgdi32 -lpolarssl -lws2_32 -lharfbuzz -lfreetype -lpng -lbz2 -lz # i686 builds ifdef DEBUG +LIBS = -lglfw -lopenGL32 -lGLEW32 -lgdi32 -lpolarssl -lws2_32 -lharfbuzz -lfreetype -lpng -lbz2 -lz LDFLAGS = -L ./deps/lib/nt_i386 -Og -g3 -fstack-protector-strong -fPIE else ifdef RELEASE_PACK +LIBS = -lglfw -lopenGL32 -lGLEW32 -lgdi32 -lpolarssl -lws2_32 -lharfbuzz -lfreetype -lpng -lbz2 -lz LDFLAGS = -L ./deps/lib/nt_i386/release -O3 -flto=8 -march=i686 -mtune=generic -fstack-protector-strong -fPIE else +LIBS = -lglfw -lopenGL32 -lGLEW32 -lgdi32 -lpolarssl -lws2_32 -lharfbuzz -lfreetype -lpng -lbz2 -lz LDFLAGS = -L ./deps/lib/nt_i386 -O3 -flto=8 -march=core2 -mfpmath=sse -fstack-protector-strong -fPIE endif endif ifdef AMD64_DEBUG +LIBS = -lglfw -lopenGL32 -lGLEW64 -lgdi32 -lpolarssl -lws2_32 -lharfbuzz -lfreetype -lpng -lbz2 -lz LDFLAGS = -L ./deps/lib/nt_amd64 -Og -g3 -fstack-protector-strong -fPIE else ifdef AMD64_RELEASE +LIBS = -lglfw -lopenGL32 -lGLEW64 -lgdi32 -lpolarssl -lws2_32 -lharfbuzz -lfreetype -lpng -lbz2 -lz LDFLAGS = -L ./deps/lib/nt_amd64/release -O3 -flto=8 -march=opteron -mtune=opteron -mfpmath=sse -fstack-protector-strong -fPIE else ifdef AMD64 +LIBS = -lglfw -lopenGL32 -lGLEW64 -lgdi32 -lpolarssl -lws2_32 -lharfbuzz -lfreetype -lpng -lbz2 -lz LDFLAGS = -L ./deps/lib/nt_amd64 -O3 -flto=8 -march=core2 -mfpmath=sse -fstack-protector-strong -fPIE endif endif diff --git a/deps/lib/nt_amd64/glew32.dll b/deps/lib/nt_amd64/glew64.dll similarity index 100% rename from deps/lib/nt_amd64/glew32.dll rename to deps/lib/nt_amd64/glew64.dll diff --git a/deps/lib/nt_amd64/release/glew32.dll b/deps/lib/nt_amd64/release/glew64.dll similarity index 100% rename from deps/lib/nt_amd64/release/glew32.dll rename to deps/lib/nt_amd64/release/glew64.dll