Fewer places to modify the SDL version/location.

This commit is contained in:
William McBrine
2019-07-15 08:12:00 -04:00
parent 07d22542ae
commit e5ea2f06fb
3 changed files with 26 additions and 21 deletions

View File

@@ -2,18 +2,29 @@
O = o
ifndef PDCURSES_SRCDIR
PDCURSES_SRCDIR = ..
endif
osdir = $(PDCURSES_SRCDIR)/sdl2
common = $(PDCURSES_SRCDIR)/common
include $(common)/libobjs.mif
ifeq ($(OS),Windows_NT)
E = .exe
CC = gcc
RM = cmd /c del
include $(osdir)/versions.mif
PLATFORM = $(shell $(CC) -dumpmachine)
SFLAGS = -Ic:/sdl2-2.0.9/$(PLATFORM)/include/SDL2
SLIBS = -Lc:/sdl2-2.0.9/$(PLATFORM)/lib -lSDL2main -lSDL2
SFLAGS = -I$(SDLBASE)/$(PLATFORM)/include/SDL2
SLIBS = -L$(SDLBASE)/$(PLATFORM)/lib -lSDL2main -lSDL2
TFLAGS = -Ic:/sdl2_ttf-2.0.15/$(PLATFORM)/include/SDL2
TLIBS =-Lc:/sdl2_ttf-2.0.15/$(PLATFORM)/lib -lSDL2_ttf
TFLAGS = -I$(TTFBASE)/$(PLATFORM)/include/SDL2
TLIBS =-L$(TTFBASE)/$(PLATFORM)/lib -lSDL2_ttf
DEMOFLAGS = -mwindows
else
@@ -25,15 +36,6 @@ else
TLIBS = -lSDL2_ttf
endif
ifndef PDCURSES_SRCDIR
PDCURSES_SRCDIR = ..
endif
osdir = $(PDCURSES_SRCDIR)/sdl2
common = $(PDCURSES_SRCDIR)/common
include $(common)/libobjs.mif
PDCURSES_SDL_H = $(osdir)/pdcsdl.h
ifeq ($(DEBUG),Y)

View File

@@ -10,19 +10,20 @@ O = obj
E = .exe
RM = del
SDL2_INCLUDE = -IC:\SDL2-2.0.9\include
SDL2_LIB = C:\SDL2-2.0.9\lib\$(PLATFORM)\SDL2.lib
SDL2_LIBMAIN = C:\SDL2-2.0.9\lib\$(PLATFORM)\SDL2main.lib
!ifndef PDCURSES_SRCDIR
PDCURSES_SRCDIR = ..
!endif
!include $(PDCURSES_SRCDIR)\common\libobjs.mif
osdir = $(PDCURSES_SRCDIR)\sdl2
common = $(PDCURSES_SRCDIR)\common
!include $(common)\libobjs.mif
!include $(osdir)\versions.mif
SDL2_INCLUDE = -I$(SDLBASE)\include
SDL2_LIB = $(SDLBASE)\lib\$(PLATFORM)\SDL2.lib
SDL2_LIBMAIN = $(SDLBASE)\lib\$(PLATFORM)\SDL2main.lib
PDCURSES_WIN_H = $(osdir)\pdcsdl.h
CC = cl.exe -nologo
@@ -37,8 +38,8 @@ LDFLAGS =
!ifdef WIDE
WIDEOPT = -DPDC_WIDE
TTF_INCLUDE = -IC:\SDL2_ttf-2.0.15\include
TTF_LIB = C:\SDL2_ttf-2.0.15\lib\$(PLATFORM)\SDL2_ttf.lib
TTF_INCLUDE = -I$(TTFBASE)\include
TTF_LIB = $(TTFBASE)\lib\$(PLATFORM)\SDL2_ttf.lib
!endif
!ifdef UTF8

2
sdl2/versions.mif Normal file
View File

@@ -0,0 +1,2 @@
SDLBASE = C:\SDL2-2.0.9
TTFBASE = C:\SDL2_ttf-2.0.15