File diff r221:56c7ed3a0581 → r222:4409829eb08f
Jamfile.next
Show inline comments
 
@@ -9,13 +9,13 @@ CFILES = 	ai.c aircraft_cmd.c aircraft_g
 
	road_gui.c roadveh_cmd.c roadveh_gui.c saveload.c sdl.c
 
	settings.c settings_gui.c ship_cmd.c ship_gui.c smallmap_gui.c
 
	sound.c spritecache.c station_cmd.c station_gui.c
 
	strings.c subsidy_gui.c texteff.c town_cmd.c town_gui.c
 
	train_cmd.c train_gui.c tree_cmd.c ttd.c
 
	tunnelbridge_cmd.c unmovable_cmd.c vehicle.c
 
	viewport.c water_cmd.c widget.c window.c screenshot.c 
 
	viewport.c water_cmd.c widget.c window.c screenshot.c
 
	airport.c grfspecial.c terraform_gui.c ;
 

	
 

	
 
LANGFILES = english.txt swedish.txt french.txt german.txt italian.txt slovak.txt hungarian.txt norwegian.txt danish.txt czech.txt galician.txt polish.txt;
 

	
 
####################
 
@@ -25,16 +25,16 @@ if $(UNIX) {
 
	SDL_CONFIG_CFLAGS = `XX_SDL_CONFIG_PLACEHOLDER_XX --cflags` ;
 
	SDL_CONFIG_LIBS = `XX_SDL_CONFIG_PLACEHOLDER_XX --libs` ;
 

	
 
	LINKFLAGS += $(SDL_CONFIG_LIBS) ;
 
	CC = gcc ;
 
	CCFLAGS += -Wall -Wno-multichar -DUNIX -DWITH_SDL ;
 
	
 

	
 
	OPTIMFLAGS = -O2 -fomit-frame-pointer ;
 
	DEBUGFLAGS = -g ;
 
	
 

	
 
# also include extmidi
 
	CFILES += extmidi.c unix.c ;
 

	
 
# compile in PNG support?
 
	if $(WITH_PNG) {
 
		CCFLAGS += -DWITH_PNG -I$(WITH_PNG) ;
 
@@ -61,26 +61,26 @@ if $(UNIX) {
 

	
 
####################
 
# MSVC on Win32
 
####################
 

	
 
actions ActWin32Res {
 
	$(VISUALC)\\..\\common\\msdev98\\bin\\rc /r /i $(STDHDRS) /fo $(<) $(>) 
 
	$(VISUALC)\\..\\common\\msdev98\\bin\\rc /r /i $(STDHDRS) /fo $(<) $(>)
 
}
 

	
 
rule Win32Res { ActWin32Res $(<) : $(>) ; DEPENDS $(<) : $(>) ; }
 

	
 
if $(TOOLSET) = VISUALC {
 
	OPTIMFLAGS = /Oa /Os /Ow /Oy /Oi /Og /Ox /Gr /Gf /Gy /Zp4 /J	/WX /W3 -DNDEBUG ;
 

	
 
	CCFLAGS += -DWIN32 -DWIN32_EXCEPTION_TRACKER ;
 
	CFILES += win32.c ;	
 
	CFILES += win32.c ;
 
	LINKFLAGS += /opt:nowin98 /LIBPATH:$(VISUALC)\\lib ;
 
	
 

	
 
	LINKLIBS = ws2_32.lib winmm.lib user32.lib gdi32.lib ;
 
		
 

	
 
# compile resources too
 
	EOBJ = ttd.res ;
 
	Win32Res ttd.res : ttd.rc ;
 

	
 
# png screenshots?
 
	if $(WITH_PNG) {
 
@@ -90,13 +90,13 @@ if $(TOOLSET) = VISUALC {
 

	
 
# zlib savegames?
 
	if $(WITH_ZLIB) {
 
		CCFLAGS += -DWITH_ZLIB ;
 
		LINKLIBS += zlibstat.lib ;
 
	}
 
	
 

	
 
# build release by default
 
	RELEASE = 1 ;
 
}
 

	
 

	
 
####################
 
@@ -104,13 +104,13 @@ if $(TOOLSET) = VISUALC {
 
####################
 
rule MyObjects {
 
	local _i _t _s ;
 

	
 
	_t = $(OUTDIR)/$(>:S=$(SUFOBJ)) ;
 
	OPTIM on $(_t) = $(3) ;
 
	
 

	
 
	MkDir $(OUTDIR) ;
 
	Depends $(_t) : $(OUTDIR) ;
 

	
 
	for _i in $(>) {
 
		_s = $(OUTDIR)/$(_i:S=$(SUFOBJ)) ;
 
		Object $(_s) : $(_i) ;
 
@@ -139,13 +139,13 @@ rule LangFile {
 
	if $(>) = lang/english.txt {
 
		CompileLang $(<) table/strings.h : ;
 
		DEPENDS table/string.h : $(>) ;
 
	} else {
 
		CompileLang $(<) : $(>) ;
 
	}
 
	
 

	
 
	Clean clean : $(<) ;
 
	DEPENDS $(<) : $(>) ;
 
	DEPENDS all : $(<) ;
 
	DEPENDS $(<) : strgen/strgen ;
 
}