diff options
| author | Thilo Schulz <arny@ats.s.bawue.de> | 2011-08-01 13:25:55 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-10 23:11:08 +0000 |
| commit | 219d220b700943169dcecdfe2dfc43c24dbf90bc (patch) | |
| tree | 1df3d344c2dbc8553a67009657dd6ec115a77976 /Makefile | |
| parent | 885cbfb2961722dfd2ff3b5e0f961a439c123254 (diff) | |
Fix compilation on MINGW
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -520,8 +520,9 @@ ifeq ($(PLATFORM),mingw32) LIBS= -lws2_32 -lwinmm -lpsapi CLIENT_LDFLAGS += -mwindows - CLIENT_LIBS = -lgdi32 -lole32 -lopengl32 - + CLIENT_LIBS = -lgdi32 -lole32 + RENDERER_LIBS = -lgdi32 -lole32 -lopengl32 + ifeq ($(USE_CURL),1) CLIENT_CFLAGS += -DUSE_CURL CLIENT_CFLAGS += $(CURL_CFLAGS) @@ -552,18 +553,25 @@ ifeq ($(PLATFORM),mingw32) # libmingw32 must be linked before libSDLmain CLIENT_LIBS += -lmingw32 + RENDERER_LIBS += -lmingw32 + ifeq ($(USE_LOCAL_HEADERS),1) CLIENT_CFLAGS += -I$(SDLHDIR)/include ifeq ($(ARCH), x86) CLIENT_LIBS += $(LIBSDIR)/win32/libSDLmain.a \ $(LIBSDIR)/win32/libSDL.dll.a + RENDERER_LIBS += $(LIBSDIR)/win32/libSDLmain.a \ + $(LIBSDIR)/win32/libSDL.dll.a else CLIENT_LIBS += $(LIBSDIR)/win64/libSDLmain.a \ $(LIBSDIR)/win64/libSDL64.dll.a + RENDERER_LIBS += $(LIBSDIR)/win64/libSDLmain.a \ + $(LIBSDIR)/win64/libSDL64.dll.a endif else CLIENT_CFLAGS += $(SDL_CFLAGS) CLIENT_LIBS += $(SDL_LIBS) + RENDERER_LIBS += $(SDL_LIBS) endif BUILD_CLIENT_SMP = 0 |