m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

win32/MSys: fix API=win32 make

Browse Source
This commit is contained in:
Thomas Bernard 2019-03-08 19:28:26 +01:00
parent 0af0ac0f29
commit 23e462d177
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Makefile
View File

@ -115,15 +115,18 @@ ifdef COMSPEC
SDLCONFIG ?= $(shell which ../3rdparty/usr/bin/sdl-config || which sdl-config) SDLCONFIG ?= $(shell which ../3rdparty/usr/bin/sdl-config || which sdl-config)
COPT += $(shell $(SDLCONFIG) --cflags) $(TTFCOPT) $(JOYCOPT) COPT += $(shell $(SDLCONFIG) --cflags) $(TTFCOPT) $(JOYCOPT)
LOPT += $(shell $(SDLCONFIG) --libs) -lSDL_image $(TTFLOPT) LOPT += $(shell $(SDLCONFIG) --libs) -lSDL_image $(TTFLOPT)
PLATFORMFILES = bin/SDL.dll bin/SDL_image.dll
endif endif
ifeq ($(API),sdl2) ifeq ($(API),sdl2)
SDLC2ONFIG ?= $(shell which ../3rdparty/usr/bin/sdl2-config || which sdl2-config) SDLC2ONFIG ?= $(shell which ../3rdparty/usr/bin/sdl2-config || which sdl2-config)
COPT += $(shell $(SDL2CONFIG) --cflags) $(TTFCOPT) $(JOYCOPT) COPT += $(shell $(SDL2CONFIG) --cflags) $(TTFCOPT) $(JOYCOPT)
LOPT += $(shell $(SDL2CONFIG) --libs) -lSDL2_image $(TTFLOPT) LOPT += $(shell $(SDL2CONFIG) --libs) -lSDL2_image $(TTFLOPT)
PLATFORMFILES = bin/SDL2.dll bin/SDL2_image.dll
endif endif
ifeq ($(API),win32) ifeq ($(API),win32)
COPT += -I../3rdparty/usr/include COPT += -I../3rdparty/usr/include $(TTFCOPT)
LOPT += -L../3rdparty/usr/lib LOPT += -L../3rdparty/usr/lib -lgdi32 -lcomdlg32
PLATFORMFILES =
endif endif
LOPT += -ltiff LOPT += -ltiff
LOPT += -lpng -lz LOPT += -lpng -lz
@ -134,7 +137,7 @@ ifdef COMSPEC
PLATFORMOBJ = winres.o PLATFORMOBJ = winres.o
PLATFORM = win32 PLATFORM = win32
#some misc files we have to add to the release archive under windows. #some misc files we have to add to the release archive under windows.
PLATFORMFILES = bin/SDL.dll bin/SDL_image.dll $(wildcard ../bin/libpng*.dll) $(wildcard ../bin/libjpeg*.dll) bin/zlib1.dll $(TTFLIBS) PLATFORMFILES += $(wildcard ../bin/libpng*.dll) $(wildcard ../bin/libjpeg*.dll) bin/zlib1.dll $(TTFLIBS)
PLATFORMFILES += bin/libtiff-5.dll PLATFORMFILES += bin/libtiff-5.dll
ZIP = zip ZIP = zip
else else