Add windows build updates to Makefile builds.

This commit is contained in:
Wes Tarro 2016-02-15 15:25:52 -05:00
parent 9548431bd0
commit e6a74a7487
7 changed files with 17 additions and 42 deletions

View File

@ -4,8 +4,8 @@ BINDIR = /usr/bin
LIBDIR = /usr/lib/mingw LIBDIR = /usr/lib/mingw
INCDIR = /usr/include/mingw/GL INCDIR = /usr/include/mingw/GL
# use gcc for linking, with ld it does not work # use gcc for linking, with ld it does not work
CC := gcc -mno-cygwin CC := gcc -mno-cygwin -fno-builtin -fno-stack-protector
LD := gcc -mno-cygwin LD := gcc -mno-cygwin -nostdlib
LN := LN :=
LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32 LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32
LDFLAGS.EXTRA = -L$(LIBDIR) LDFLAGS.EXTRA = -L$(LIBDIR)
@ -17,8 +17,3 @@ LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib
LIB.SHARED = $(NAME).dll LIB.SHARED = $(NAME).dll
LIB.STATIC = lib$(NAME).a # the static lib will be broken LIB.STATIC = lib$(NAME).a # the static lib will be broken
LDFLAGS.SO = -shared -Wl,-soname,$(LIB.SONAME) -Wl,--out-implib,lib/$(LIB.DEVLNK) LDFLAGS.SO = -shared -Wl,-soname,$(LIB.SONAME) -Wl,--out-implib,lib/$(LIB.DEVLNK)
LIB.SONAME.MX = lib$(NAME)mx.dll
LIB.DEVLNK.MX = lib$(NAME)mx.dll.a # for mingw this is the dll import lib
LIB.SHARED.MX = $(NAME)mx.dll
LIB.STATIC.MX = lib$(NAME)mx.a # the static lib will be broken
LDFLAGS.SO.MX = -shared -Wl,-soname,$(LIB.SONAME.MX) -Wl,--out-implib,lib/$(LIB.DEVLNK.MX)

View File

@ -6,6 +6,6 @@
include config/Makefile.linux-mingw32 include config/Makefile.linux-mingw32
CC := i686-pc-mingw32-gcc CC := i686-pc-mingw32-gcc -fno-builtin -fno-stack-protector
LD := i686-pc-mingw32-ld LD := i686-pc-mingw32-ld -nostdlib
LDFLAGS.GL += -L/usr/i686-pc-mingw32/sys-root/mingw/lib LDFLAGS.GL += -L/usr/i686-pc-mingw32/sys-root/mingw/lib

View File

@ -5,11 +5,11 @@
# #
NAME := glew32 NAME := glew32
CC := i686-w64-mingw32-gcc CC := i686-w64-mingw32-gcc -fno-builtin -fno-stack-protector
LD := i686-w64-mingw32-ld LD := i686-w64-mingw32-ld -nostdlib
LN := LN :=
STRIP := STRIP :=
LDFLAGS.GL = -lopengl32 -lgdi32 -lmsvcrt -luser32 -lkernel32 LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32
WARN = -Wall -W WARN = -Wall -W
POPT = -O2 POPT = -O2
BIN.SUFFIX = .exe BIN.SUFFIX = .exe
@ -18,8 +18,3 @@ LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib
LIB.SHARED = $(NAME).dll LIB.SHARED = $(NAME).dll
LIB.STATIC = lib$(NAME).a # the static lib will be broken LIB.STATIC = lib$(NAME).a # the static lib will be broken
LDFLAGS.SO = -shared -soname $(LIB.SONAME) --out-implib lib/$(LIB.DEVLNK) LDFLAGS.SO = -shared -soname $(LIB.SONAME) --out-implib lib/$(LIB.DEVLNK)
LIB.SONAME.MX = lib$(NAME)mx.dll
LIB.DEVLNK.MX = lib$(NAME)mx.dll.a # for mingw this is the dll import lib
LIB.SHARED.MX = $(NAME)mx.dll
LIB.STATIC.MX = lib$(NAME)mx.a # the static lib will be broken
LDFLAGS.SO.MX = -shared -soname $(LIB.SONAME.MX) --out-implib lib/$(LIB.DEVLNK.MX)

View File

@ -6,11 +6,11 @@
NAME := glew32 NAME := glew32
HOST := i586-mingw32msvc HOST := i586-mingw32msvc
CC := $(HOST)-gcc CC := $(HOST)-gcc -fno-builtin -fno-stack-protector
LD := $(HOST)-ld LD := $(HOST)-ld -nostdlib
LN := LN :=
STRIP := STRIP :=
LDFLAGS.GL = -lopengl32 -lgdi32 -lmsvcrt -luser32 -lkernel32 LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32
WARN = -Wall -W WARN = -Wall -W
POPT = -O2 POPT = -O2
BIN.SUFFIX = .exe BIN.SUFFIX = .exe
@ -19,8 +19,3 @@ LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib
LIB.SHARED = $(NAME).dll LIB.SHARED = $(NAME).dll
LIB.STATIC = lib$(NAME).a # the static lib will be broken LIB.STATIC = lib$(NAME).a # the static lib will be broken
LDFLAGS.SO = -shared -soname $(LIB.SONAME) --out-implib lib/$(LIB.DEVLNK) LDFLAGS.SO = -shared -soname $(LIB.SONAME) --out-implib lib/$(LIB.DEVLNK)
LIB.SONAME.MX = lib$(NAME)mx.dll
LIB.DEVLNK.MX = lib$(NAME)mx.dll.a # for mingw this is the dll import lib
LIB.SHARED.MX = $(NAME)mx.dll
LIB.STATIC.MX = lib$(NAME)mx.a # the static lib will be broken
LDFLAGS.SO.MX = -shared -soname $(LIB.SONAME.MX) --out-implib lib/$(LIB.DEVLNK.MX)

View File

@ -6,11 +6,11 @@
NAME := glew32 NAME := glew32
HOST := i686-w64-mingw32 HOST := i686-w64-mingw32
CC := $(HOST)-gcc CC := $(HOST)-gcc -fno-builtin -fno-stack-protector
LD := $(HOST)-ld LD := $(HOST)-ld -nostdlib
LN := LN :=
STRIP := STRIP :=
LDFLAGS.GL = -lopengl32 -lgdi32 -lmsvcrt -luser32 -lkernel32 LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32
WARN = -Wall -W WARN = -Wall -W
POPT = -O2 POPT = -O2
BIN.SUFFIX = .exe BIN.SUFFIX = .exe
@ -19,8 +19,3 @@ LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib
LIB.SHARED = $(NAME).dll LIB.SHARED = $(NAME).dll
LIB.STATIC = lib$(NAME).a # the static lib will be broken LIB.STATIC = lib$(NAME).a # the static lib will be broken
LDFLAGS.SO = -shared -soname $(LIB.SONAME) --out-implib lib/$(LIB.DEVLNK) LDFLAGS.SO = -shared -soname $(LIB.SONAME) --out-implib lib/$(LIB.DEVLNK)
LIB.SONAME.MX = lib$(NAME)mx.dll
LIB.DEVLNK.MX = lib$(NAME)mx.dll.a # for mingw this is the dll import lib
LIB.SHARED.MX = $(NAME)mx.dll
LIB.STATIC.MX = lib$(NAME)mx.a # the static lib will be broken
LDFLAGS.SO.MX = -shared -soname $(LIB.SONAME.MX) --out-implib lib/$(LIB.DEVLNK.MX)

View File

@ -1,7 +1,7 @@
NAME = glew32 NAME = glew32
# use gcc for linking, with ld it does not work # use gcc for linking, with ld it does not work
CC := gcc CC := gcc -fno-builtin -fno-stack-protector
LD := gcc LD := gcc -nostdlib
LN := LN :=
LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32 LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32
LDFLAGS.EXTRA = -L/mingw/lib LDFLAGS.EXTRA = -L/mingw/lib
@ -13,8 +13,3 @@ LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib
LIB.SHARED = $(NAME).dll LIB.SHARED = $(NAME).dll
LIB.STATIC = lib$(NAME).a # the static lib will be broken LIB.STATIC = lib$(NAME).a # the static lib will be broken
LDFLAGS.SO = -shared -Wl,-soname,$(LIB.SONAME) -Wl,--out-implib,lib/$(LIB.DEVLNK) LDFLAGS.SO = -shared -Wl,-soname,$(LIB.SONAME) -Wl,--out-implib,lib/$(LIB.DEVLNK)
LIB.SONAME.MX = lib$(NAME)mx.dll
LIB.DEVLNK.MX = lib$(NAME)mx.dll.a # for mingw this is the dll import lib
LIB.SHARED.MX = $(NAME)mx.dll
LIB.STATIC.MX = lib$(NAME)mx.a # the static lib will be broken
LDFLAGS.SO.MX = -shared -Wl,-soname,$(LIB.SONAME.MX) -Wl,--out-implib,lib/$(LIB.DEVLNK.MX)

View File

@ -1,7 +1,7 @@
NAME = glew32 NAME = glew32
# use gcc for linking, with ld it does not work # use gcc for linking, with ld it does not work
CC := gcc CC := gcc -fno-builtin -fno-stack-protector
LD := gcc LD := gcc -nostdlib
LN := LN :=
CFLAGS.EXTRA += -D_WIN32 CFLAGS.EXTRA += -D_WIN32
LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32 LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32