Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 66298
Collapse All | Expand All

(-)options_string.c~ (-7 / +2 lines)
Lines 207-213 Link Here
207
	if (strcmp((g_strstrip(target->sound_mixer_plugin)),""))
207
	if (strcmp((g_strstrip(target->sound_mixer_plugin)),""))
208
		sound_mixer_plugin = g_strdup_printf("-sound-mixer-plugin %s",target->sound_mixer_plugin);
208
		sound_mixer_plugin = g_strdup_printf("-sound-mixer-plugin %s",target->sound_mixer_plugin);
209
209
210
	option_string = g_strdup_printf (" -%ssound "
210
	option_string = g_strdup_printf (
211
				"-%ssamples "
211
				"-%ssamples "
212
				"%s "				/* fakesound */
212
				"%s "				/* fakesound */
213
				"-samplefreq %i "
213
				"-samplefreq %i "
Lines 223-229 Link Here
223
				"%s "				/* QNX audio_preferred */
223
				"%s "				/* QNX audio_preferred */
224
				"%s "				/* dsp_plugin */
224
				"%s "				/* dsp_plugin */
225
				"%s ",				/* sound_mixer_plugin */
225
				"%s ",				/* sound_mixer_plugin */
226
				(target->sound)?"":"no",
227
				(target->samples)?"":"no",
226
				(target->samples)?"":"no",
228
				(target->fakesound)?"-fakesound":"",
227
				(target->fakesound)?"-fakesound":"",
229
				target->samplefre,
228
				target->samplefre,
Lines 385-391 Link Here
385
						"%s "				/* vidix */
384
						"%s "				/* vidix */
386
						"%s "				/* newext */
385
						"%s "				/* newext */
387
						"-%sxsync "
386
						"-%sxsync "
388
						"-%sprivatecmap "
389
						"%s "
387
						"%s "
390
						"%s "
388
						"%s "
391
						"%s ",				/* Video mode */
389
						"%s ",				/* Video mode */
Lines 395-401 Link Here
395
						vidix,
393
						vidix,
396
						newext?newext:"",
394
						newext?newext:"",
397
						(target->xsync)?"":"no",
395
						(target->xsync)?"":"no",
398
						(target->privatecmap)?"":"no",
399
						xil,
396
						xil,
400
						mtxil,
397
						mtxil,
401
						Video_Mode_option?Video_Mode_option:""
398
						Video_Mode_option?Video_Mode_option:""
Lines 644-650 Link Here
644
	    (strcmp(exec->target,"x11")==0 ||
641
	    (strcmp(exec->target,"x11")==0 ||
645
	     strcmp(exec->target,"SDL")==0))
642
	     strcmp(exec->target,"SDL")==0))
646
	{
643
	{
647
	  char *mapkey_options=strcmp(exec->target,"x11")?"sdlmapkey":"mapkey";
644
	  char *mapkey_options=strcmp(exec->target,"x11")?"mapkey":"sdlmapkey";
648
	  char *oldkeymap;
645
	  char *oldkeymap;
649
	  int i;
646
	  int i;
650
647
Lines 701-707 Link Here
701
	option_string = g_strdup_printf ("-joytype %i "
698
	option_string = g_strdup_printf ("-joytype %i "
702
				"-%sanalogstick "
699
				"-%sanalogstick "
703
				"%s "					/* joy */
700
				"%s "					/* joy */
704
				"-%smouse "
705
				"%s "
701
				"%s "
706
				"-%susbpspad "
702
				"-%susbpspad "
707
				"-%srapidfire "
703
				"-%srapidfire "
Lines 716-722 Link Here
716
				target->joytype,
712
				target->joytype,
717
				(target->analogstick)?"":"no",
713
				(target->analogstick)?"":"no",
718
				joy?joy:"",
714
				joy?joy:"",
719
				(target->mouse)?"":"no",
720
				(ctrlr)?ctrlr:"",
715
				(ctrlr)?ctrlr:"",
721
				(target->usbpspad)?"":"no",
716
				(target->usbpspad)?"":"no",
722
				(target->rapidfire)?"":"no",
717
				(target->rapidfire)?"":"no",

Return to bug 66298