zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 11:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Boredom

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@220 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-07-14 07:28:32 +00:00
parent c8589f5b9a
commit f5e728ab22
3 changed files with 422 additions and 415 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
polymer/eduke32/Makefile
View file

@ -42,6 +42,7 @@ OURCXXFLAGS=-fno-exceptions -fno-rtti
LIBS=-lm LIBS=-lm
ifneq (0,$(JFAUD)) ifneq (0,$(JFAUD))
JFAUDLIBS=../jfaud/libjfaud.a ../jfaud/mpadec/libmpadec.a JFAUDLIBS=../jfaud/libjfaud.a ../jfaud/mpadec/libmpadec.a
OURCFLAGS+=-DJFAUD
endif endif
NASMFLAGS=-s #-g NASMFLAGS=-s #-g
@ -207,8 +208,13 @@ $(OBJ)%.$o: $(SRC)jmact/%.c
$(OBJ)%.$o: $(SRC)jaudiolib/%.c $(OBJ)%.$o: $(SRC)jaudiolib/%.c
$(CC) $(CFLAGS) $(OURCFLAGS) -c $< -o $@ 2>&1 $(CC) $(CFLAGS) $(OURCFLAGS) -c $< -o $@ 2>&1
ifeq (1,$(JFAUD))
$(OBJ)%.$o: $(SRC)misc/%.rc
windres -i $< -o $@ --include-dir=$(EINC) --include-dir=$(SRC) -DJFAUD
else
$(OBJ)%.$o: $(SRC)misc/%.rc $(OBJ)%.$o: $(SRC)misc/%.rc
windres -i $< -o $@ --include-dir=$(EINC) --include-dir=$(SRC) windres -i $< -o $@ --include-dir=$(EINC) --include-dir=$(SRC)
endif
$(OBJ)%.$o: $(SRC)util/%.c $(OBJ)%.$o: $(SRC)util/%.c
$(CC) $(CFLAGS) $(OURCFLAGS) -c $< -o $@ 2>&1 $(CC) $(CFLAGS) $(OURCFLAGS) -c $< -o $@ 2>&1

7
polymer/eduke32/source/misc/gameres.rc
View file

@ -19,7 +19,6 @@ BEGIN
CONTROL "", WIN_STARTWIN_MESSAGES, "EDIT", ES_MULTILINE | ES_READONLY | WS_CHILD | WS_VSCROLL, 0, 0, 32, 32 CONTROL "", WIN_STARTWIN_MESSAGES, "EDIT", ES_MULTILINE | ES_READONLY | WS_CHILD | WS_VSCROLL, 0, 0, 32, 32
END END
WIN_STARTWINPAGE_CONFIG DIALOGEX DISCARDABLE 20, 40, 279, 168 WIN_STARTWINPAGE_CONFIG DIALOGEX DISCARDABLE 20, 40, 279, 168
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
CAPTION "Dialog" CAPTION "Dialog"
@ -29,8 +28,13 @@ BEGIN
CONTROL "", IDCVMODE, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 6, 80, 56 CONTROL "", IDCVMODE, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 6, 80, 56
CONTROL "&Fullscreen", IDCFULLSCREEN, "BUTTON", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 148, 8, 49, 10 CONTROL "&Fullscreen", IDCFULLSCREEN, "BUTTON", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 148, 8, 49, 10
#ifdef JFAUD
CONTROL "S&ound driver:", -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 28, 50, 8
CONTROL "", IDCSOUNDDRV, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 26, 110, 56
#else
CONTROL "S&ound driver:", -1, "STATIC", SS_LEFT | WS_CHILD | WS_DISABLED | WS_VISIBLE, 5, 28, 50, 8 CONTROL "S&ound driver:", -1, "STATIC", SS_LEFT | WS_CHILD | WS_DISABLED | WS_VISIBLE, 5, 28, 50, 8
CONTROL "", IDCSOUNDDRV, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_DISABLED | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 26, 110, 56 CONTROL "", IDCSOUNDDRV, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_DISABLED | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 26, 110, 56
#endif
CONTROL "&MIDI device:", -1, "STATIC", SS_LEFT | WS_CHILD | WS_DISABLED | WS_VISIBLE, 5, 44, 50, 8 CONTROL "&MIDI device:", -1, "STATIC", SS_LEFT | WS_CHILD | WS_DISABLED | WS_VISIBLE, 5, 44, 50, 8
CONTROL "", IDCMIDIDEV, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_DISABLED | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 42, 110, 56 CONTROL "", IDCMIDIDEV, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_DISABLED | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 42, 110, 56
@ -40,7 +44,6 @@ BEGIN
CONTROL "&Always show configuration on start", IDCALWAYSSHOW, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 118, 116, 140, 8 CONTROL "&Always show configuration on start", IDCALWAYSSHOW, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 118, 116, 140, 8
END END
WIN_STARTWINPAGE_GAME DIALOGEX DISCARDABLE 20, 40, 279, 168 WIN_STARTWINPAGE_GAME DIALOGEX DISCARDABLE 20, 40, 279, 168
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
CAPTION "Dialog" CAPTION "Dialog"

2
polymer/eduke32/source/startwin.game.c
View file

@ -539,7 +539,6 @@ int startwin_run(void)
duke3dgrp = settings.selectedgrp; duke3dgrp = settings.selectedgrp;
} }
#ifdef JFAUD
if (wavedevs) { if (wavedevs) {
struct audioenumdev *d, *e; struct audioenumdev *d, *e;
free(wavedevs->drvs); free(wavedevs->drvs);
@ -550,7 +549,6 @@ int startwin_run(void)
} }
free(wavedevs); free(wavedevs);
} }
#endif
return done; return done;
} }