Attachment #122735 for bug #132055





if ENABLE_CLIENT
bin_PROGRAMS += ../$(MAIN_EXE)
if MAIN_PLATFORM_UNIX_ALLEGRO
bin_SCRIPTS += vavoom
endif
if MAIN_PLATFORM_UNIX_SDL
bin_SCRIPTS += vavoom
endif
endif

_____MAIN_EXE__CPPFLAGS = @MAIN_CPPFLAGS@

	gl_win32.cpp
endif

vavoom: Makefile
	echo "#!/bin/sh" > $@
	echo "# Needed to make symlinks/shortcuts work." >> $@
	echo "# the binaries must run with correct working directory" >> $@
	echo "cd \"$(datadir)/vavoom\"" >> $@
	echo "\"$(bindir)/$(MAIN_EXE)\" \$$* $(IWADDIR_PARM)" >> $@
	echo "exit \$$?" >> $@

#---------------------------------------
#
#	Dedicated server
#
#---------------------------------------

if ENABLE_SERVER
bin_PROGRAMS += ../$(SERVER_EXE)
if SERVER_PLATFORM_UNIX
bin_SCRIPTS += vavoom-dedicated
endif
endif

_____SERVER_EXE__CPPFLAGS = @SV_CPPFLAGS@ -DSERVER

	vavoom.rc
endif

vavoom-dedicated: Makefile
	echo "#!/bin/sh" > $@
	echo "# Needed to make symlinks/shortcuts work." >> $@
	echo "# the binaries must run with correct working directory" >> $@
	echo "cd \"$(datadir)/vavoom\"" >> $@
	echo "\"$(bindir)/$(SERVER_EXE)\" \$$* $(IWADDIR_PARM)" >> $@
	echo "exit \$$?" >> $@

# ---------------------------------------
#
#	Compilation of Windows resources




#
#---------------------------------------
@ENABLE_CLIENT_TRUE@am__append_1 = ../$(MAIN_EXE)
@ENABLE_CLIENT_TRUE@@MAIN_PLATFORM_UNIX_ALLEGRO_TRUE@am__append_2 = vavoom
@ENABLE_CLIENT_TRUE@@MAIN_PLATFORM_UNIX_SDL_TRUE@am__append_3 = vavoom

#-- i386 assembler files --
@MAIN_ASM_I386_TRUE@am__append_4 = \

#
#---------------------------------------
@ENABLE_SERVER_TRUE@am__append_21 = ../$(SERVER_EXE)
@ENABLE_SERVER_TRUE@@SERVER_PLATFORM_UNIX_TRUE@am__append_22 = vavoom-dedicated
@SERVER_PLATFORM_DJGPP_TRUE@am__append_23 = \
@SERVER_PLATFORM_DJGPP_TRUE@	mplib.c \
@SERVER_PLATFORM_DJGPP_TRUE@	mplpc.c \

sysconfdir = @sysconfdir@
target_alias = @target_alias@
SUBDIRS = timidity
bin_SCRIPTS = $(am__append_2) $(am__append_3) $(am__append_22)
_____MAIN_EXE__CPPFLAGS = @MAIN_CPPFLAGS@
_____MAIN_EXE__CXXFLAGS = @MAIN_CXXFLAGS@
_____MAIN_EXE__DEFS = 

	uninstall-dist_baseDATA uninstall-info-am


vavoom: Makefile
	echo "#!/bin/sh" > $@
	echo "# Needed to make symlinks/shortcuts work." >> $@
	echo "# the binaries must run with correct working directory" >> $@
	echo "cd \"$(datadir)/vavoom\"" >> $@
	echo "\"$(bindir)/$(MAIN_EXE)\" \$$* $(IWADDIR_PARM)" >> $@
	echo "exit \$$?" >> $@

vavoom-dedicated: Makefile
	echo "#!/bin/sh" > $@
	echo "# Needed to make symlinks/shortcuts work." >> $@
	echo "# the binaries must run with correct working directory" >> $@
	echo "cd \"$(datadir)/vavoom\"" >> $@
	echo "\"$(bindir)/$(SERVER_EXE)\" \$$* $(IWADDIR_PARM)" >> $@
	echo "exit \$$?" >> $@

# ---------------------------------------
#
#	Compilation of Windows resources

Return to bug 132055

Lines 19-30 Link Here

(-)source/Makefile.am (-31 lines)
19		19
20	if ENABLE_CLIENT	20	if ENABLE_CLIENT
21	bin_PROGRAMS += ../$(MAIN_EXE)	21	bin_PROGRAMS += ../$(MAIN_EXE)
22	if MAIN_PLATFORM_UNIX_ALLEGRO
23	bin_SCRIPTS += vavoom
24	endif
25	if MAIN_PLATFORM_UNIX_SDL
26	bin_SCRIPTS += vavoom
27	endif
28	endif	22	endif
29		23
30	_____MAIN_EXE__CPPFLAGS = @MAIN_CPPFLAGS@	24	_____MAIN_EXE__CPPFLAGS = @MAIN_CPPFLAGS@
Lines 405-429 Link Here
405	gl_win32.cpp	399	gl_win32.cpp
406	endif	400	endif
407		401
408	vavoom: Makefile
409	echo "#!/bin/sh" > $@
410	echo "# Needed to make symlinks/shortcuts work." >> $@
411	echo "# the binaries must run with correct working directory" >> $@
412	echo "cd \"$(datadir)/vavoom\"" >> $@
413	echo "\"$(bindir)/$(MAIN_EXE)\" \$$* $(IWADDIR_PARM)" >> $@
414	echo "exit \$$?" >> $@
415
416	#---------------------------------------
417	#
418	# Dedicated server
419	#
420	#---------------------------------------
421
422	if ENABLE_SERVER	402	if ENABLE_SERVER
423	bin_PROGRAMS += ../$(SERVER_EXE)	403	bin_PROGRAMS += ../$(SERVER_EXE)
424	if SERVER_PLATFORM_UNIX
425	bin_SCRIPTS += vavoom-dedicated
426	endif
427	endif	404	endif
428		405
429	_____SERVER_EXE__CPPFLAGS = @SV_CPPFLAGS@ -DSERVER	406	_____SERVER_EXE__CPPFLAGS = @SV_CPPFLAGS@ -DSERVER
Lines 534-547 Link Here
534	vavoom.rc	511	vavoom.rc
535	endif	512	endif
536		513
537	vavoom-dedicated: Makefile
538	echo "#!/bin/sh" > $@
539	echo "# Needed to make symlinks/shortcuts work." >> $@
540	echo "# the binaries must run with correct working directory" >> $@
541	echo "cd \"$(datadir)/vavoom\"" >> $@
542	echo "\"$(bindir)/$(SERVER_EXE)\" \$$* $(IWADDIR_PARM)" >> $@
543	echo "exit \$$?" >> $@
544
545	# ---------------------------------------	514	# ---------------------------------------
546	#	515	#
547	# Compilation of Windows resources	516	# Compilation of Windows resources

Lines 46-53 Link Here

(-)source/Makefile.in (-20 lines)
46	#	46	#
47	#---------------------------------------	47	#---------------------------------------
48	@ENABLE_CLIENT_TRUE@am__append_1 = ../$(MAIN_EXE)	48	@ENABLE_CLIENT_TRUE@am__append_1 = ../$(MAIN_EXE)
49	@ENABLE_CLIENT_TRUE@@MAIN_PLATFORM_UNIX_ALLEGRO_TRUE@am__append_2 = vavoom
50	@ENABLE_CLIENT_TRUE@@MAIN_PLATFORM_UNIX_SDL_TRUE@am__append_3 = vavoom
51		49
52	#-- i386 assembler files --	50	#-- i386 assembler files --
53	@MAIN_ASM_I386_TRUE@am__append_4 = \	51	@MAIN_ASM_I386_TRUE@am__append_4 = \
Lines 199-205 Link Here
199	#	197	#
200	#---------------------------------------	198	#---------------------------------------
201	@ENABLE_SERVER_TRUE@am__append_21 = ../$(SERVER_EXE)	199	@ENABLE_SERVER_TRUE@am__append_21 = ../$(SERVER_EXE)
202	@ENABLE_SERVER_TRUE@@SERVER_PLATFORM_UNIX_TRUE@am__append_22 = vavoom-dedicated
203	@SERVER_PLATFORM_DJGPP_TRUE@am__append_23 = \	200	@SERVER_PLATFORM_DJGPP_TRUE@am__append_23 = \
204	@SERVER_PLATFORM_DJGPP_TRUE@ mplib.c \	201	@SERVER_PLATFORM_DJGPP_TRUE@ mplib.c \
205	@SERVER_PLATFORM_DJGPP_TRUE@ mplpc.c \	202	@SERVER_PLATFORM_DJGPP_TRUE@ mplpc.c \
Lines 828-834 Link Here
828	sysconfdir = @sysconfdir@	825	sysconfdir = @sysconfdir@
829	target_alias = @target_alias@	826	target_alias = @target_alias@
830	SUBDIRS = timidity	827	SUBDIRS = timidity
831	bin_SCRIPTS = $(am__append_2) $(am__append_3) $(am__append_22)
832	_____MAIN_EXE__CPPFLAGS = @MAIN_CPPFLAGS@	828	_____MAIN_EXE__CPPFLAGS = @MAIN_CPPFLAGS@
833	_____MAIN_EXE__CXXFLAGS = @MAIN_CXXFLAGS@	829	_____MAIN_EXE__CXXFLAGS = @MAIN_CXXFLAGS@
834	_____MAIN_EXE__DEFS =	830	_____MAIN_EXE__DEFS =
Lines 5184-5205 Link Here
5184	uninstall-dist_baseDATA uninstall-info-am	5180	uninstall-dist_baseDATA uninstall-info-am
5185		5181
5186		5182
5187	vavoom: Makefile
5188	echo "#!/bin/sh" > $@
5189	echo "# Needed to make symlinks/shortcuts work." >> $@
5190	echo "# the binaries must run with correct working directory" >> $@
5191	echo "cd \"$(datadir)/vavoom\"" >> $@
5192	echo "\"$(bindir)/$(MAIN_EXE)\" \$$* $(IWADDIR_PARM)" >> $@
5193	echo "exit \$$?" >> $@
5194
5195	vavoom-dedicated: Makefile
5196	echo "#!/bin/sh" > $@
5197	echo "# Needed to make symlinks/shortcuts work." >> $@
5198	echo "# the binaries must run with correct working directory" >> $@
5199	echo "cd \"$(datadir)/vavoom\"" >> $@
5200	echo "\"$(bindir)/$(SERVER_EXE)\" \$$* $(IWADDIR_PARM)" >> $@
5201	echo "exit \$$?" >> $@
5202
5203	# ---------------------------------------	5183	# ---------------------------------------
5204	#	5184	#
5205	# Compilation of Windows resources	5185	# Compilation of Windows resources