Browse Source

AMD64 build is go, folks

master
despair 2 years ago
parent
commit
b00dbd35da
38 changed files with 14 additions and 8 deletions
  1. 5
    5
      NTMakefile
  2. BIN
      deps/lib/nt_amd64/glew32.dll
  3. BIN
      deps/lib/nt_amd64/glew64.dll
  4. BIN
      deps/lib/nt_amd64/libbz2.a
  5. BIN
      deps/lib/nt_amd64/libfreetype.a
  6. BIN
      deps/lib/nt_amd64/libglfw.a
  7. BIN
      deps/lib/nt_amd64/libharfbuzz.a
  8. BIN
      deps/lib/nt_amd64/libpng.a
  9. BIN
      deps/lib/nt_amd64/libpolarssl.a
  10. BIN
      deps/lib/nt_amd64/libz.a
  11. BIN
      deps/lib/nt_amd64/release/glew32.dll
  12. BIN
      deps/lib/nt_amd64/release/glew64.dll
  13. BIN
      deps/lib/nt_amd64/release/libbz2.a
  14. BIN
      deps/lib/nt_amd64/release/libfreetype.a
  15. BIN
      deps/lib/nt_amd64/release/libglfw.a
  16. BIN
      deps/lib/nt_amd64/release/libharfbuzz.a
  17. BIN
      deps/lib/nt_amd64/release/libpng.a
  18. BIN
      deps/lib/nt_amd64/release/libpolarssl.a
  19. BIN
      deps/lib/nt_amd64/release/libz.a
  20. BIN
      deps/lib/nt_i386/libpolarssl.a
  21. BIN
      deps/lib/nt_i386/release/libbz2.a
  22. BIN
      deps/lib/nt_i386/release/libfreetype.a
  23. BIN
      deps/lib/nt_i386/release/libglfw3.a
  24. BIN
      deps/lib/nt_i386/release/libharfbuzz.a
  25. BIN
      deps/lib/nt_i386/release/libpng.a
  26. BIN
      deps/lib/nt_i386/release/libpolarssl.a
  27. BIN
      deps/lib/nt_i386/release/libz.a
  28. BIN
      reltools/winnt/amd64/glew32.dll
  29. BIN
      reltools/winnt/amd64/libgcc_s_seh-1.dll
  30. BIN
      reltools/winnt/amd64/libssp-0.dll
  31. BIN
      reltools/winnt/amd64/libstdc++-6.dll
  32. BIN
      reltools/winnt/amd64/libwinpthread-1.dll
  33. 0
    0
      reltools/winnt/i386/glew32.dll
  34. 0
    0
      reltools/winnt/i386/libgcc_s_sjlj-1.dll
  35. 0
    0
      reltools/winnt/i386/libssp-0.dll
  36. 0
    0
      reltools/winnt/i386/libstdc++-6.dll
  37. 3
    2
      src/tlsf.c
  38. 6
    1
      winnt-ci.sh

+ 5
- 5
NTMakefile View File

@@ -27,7 +27,7 @@ CFLAGS = -O3 -march=opteron -mtune=opteron -mfpmath=sse -fstack-protector-stro
else
ifdef AMD64
CXXFLAGS = -O3 -march=core2 -mfpmath=sse -fstack-protector-strong -fPIE -flto=8 -std=c++14 -DVERSION=\"$(GIT_VERSION)\"
CFLAGS = -O3 -march=core2 -mfpmath=sse -fstack-protector-strong -fPIE -flto=8 -std=c11 -DVERSION=\"$(GIT_VERSION)\"
CFLAGS = -O3 -march=core2 -mfpmath=sse -fstack-protector-strong -fPIE -std=c11 -DVERSION=\"$(GIT_VERSION)\" -flto=8
endif
endif
endif
@@ -50,16 +50,16 @@ endif
endif
ifdef AMD64_DEBUG
LIBS = -lglfw -lopenGL32 -lGLEW64 -lgdi32 -lpolarssl -lws2_32 -lharfbuzz -lfreetype -lpng -lbz2 -lz
LIBS = -lglfw -lopenGL32 -lglew32 -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
LIBS = -lglfw -lopenGL32 -lglew32 -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
LIBS = -lglfw -lopenGL32 -lglew32 -lgdi32 -lpolarssl -lws2_32 -lharfbuzz -lfreetype -lpng -lbz2 -lz
LDFLAGS = -L ./deps/lib/nt_amd64 -O3 -march=core2 -mfpmath=sse -fstack-protector-strong -fPIE -flto=8
endif
endif
endif

BIN
deps/lib/nt_amd64/glew32.dll View File


BIN
deps/lib/nt_amd64/glew64.dll View File


BIN
deps/lib/nt_amd64/libbz2.a View File


BIN
deps/lib/nt_amd64/libfreetype.a View File


BIN
deps/lib/nt_amd64/libglfw.a View File


BIN
deps/lib/nt_amd64/libharfbuzz.a View File


BIN
deps/lib/nt_amd64/libpng.a View File


BIN
deps/lib/nt_amd64/libpolarssl.a View File


BIN
deps/lib/nt_amd64/libz.a View File


BIN
deps/lib/nt_amd64/release/glew32.dll View File


BIN
deps/lib/nt_amd64/release/glew64.dll View File


BIN
deps/lib/nt_amd64/release/libbz2.a View File


BIN
deps/lib/nt_amd64/release/libfreetype.a View File


BIN
deps/lib/nt_amd64/release/libglfw.a View File


BIN
deps/lib/nt_amd64/release/libharfbuzz.a View File


BIN
deps/lib/nt_amd64/release/libpng.a View File


BIN
deps/lib/nt_amd64/release/libpolarssl.a View File


BIN
deps/lib/nt_amd64/release/libz.a View File


BIN
deps/lib/nt_i386/libpolarssl.a View File


BIN
deps/lib/nt_i386/release/libbz2.a View File


BIN
deps/lib/nt_i386/release/libfreetype.a View File


BIN
deps/lib/nt_i386/release/libglfw3.a View File


BIN
deps/lib/nt_i386/release/libharfbuzz.a View File


BIN
deps/lib/nt_i386/release/libpng.a View File


BIN
deps/lib/nt_i386/release/libpolarssl.a View File


BIN
deps/lib/nt_i386/release/libz.a View File


BIN
reltools/winnt/amd64/glew32.dll View File


BIN
reltools/winnt/amd64/libgcc_s_seh-1.dll View File


BIN
reltools/winnt/amd64/libssp-0.dll View File


BIN
reltools/winnt/amd64/libstdc++-6.dll View File


BIN
reltools/winnt/amd64/libwinpthread-1.dll View File


reltools/winnt/glew32.dll → reltools/winnt/i386/glew32.dll View File


reltools/winnt/libgcc_s_sjlj-1.dll → reltools/winnt/i386/libgcc_s_sjlj-1.dll View File


reltools/winnt/libssp-0.dll → reltools/winnt/i386/libssp-0.dll View File


reltools/winnt/libstdc++-6.dll → reltools/winnt/i386/libstdc++-6.dll View File


+ 3
- 2
src/tlsf.c View File

@@ -137,7 +137,7 @@
#define _DEBUG_TLSF_ (0)
#endif

#ifdef _WIN32
#if defined(_WIN32)
#include "tlsf-winnt.h"
BOOL using_dynamic_heap = TRUE;
SYSTEM_INFO nt_sysinfo;
@@ -190,11 +190,12 @@ cache_system_info (void)
nt_build_number &= 0xffff;
}

#ifndef _WIN64
int getpagesize()
{
return nt_sysinfo.dwPageSize;
}
#endif
/* Info for managing our preload heap, which is essentially a fixed size
data area in the executable. */
PIMAGE_SECTION_HEADER preload_heap_section;

+ 6
- 1
winnt-ci.sh View File

@@ -10,6 +10,11 @@ strip -s netrunner.exe
mv *.pnm bin 2> /dev/null
mv *.crt bin 2> /dev/null
mv *.ttf bin 2> /dev/null
cp reltools/winnt/*.dll bin
if [ $MSYSTEM == "MINGW32" ]
then
cp reltools/winnt/i386/*.dll bin
else
cp reltools/wint/amd64/*.dll bin
fi
mv LICENSE bin
mv netrunner.exe bin

Loading…
Cancel
Save