Merge branch 'master' of github.com:calref/cboe

This commit is contained in:
2014-07-12 22:14:28 -04:00
280 changed files with 113 additions and 448 deletions

6
.gitignore vendored
View File

@@ -2,10 +2,12 @@
*.slo
*.lo
*.o
*.res
# Compiled Dynamic libraries
*.so
*.dylib
*.dll
# Compiled Static libraries
*.lai
@@ -22,4 +24,6 @@ Win32/*/bin
Win32/*/obj
*.layout
*.depend
*blades.ini
*blades.ini
.config.vars

View File

@@ -1,57 +0,0 @@
# Project: Blades of Exile Character Editor
# Makefile created by Dev-C++ 4.9.9.2
CPP = amd64-mingw32msvc-g++
CC = amd64-mingw32msvc-gcc
WINDRES = amd64-mingw32msvc-windres
RES = Blades_of_Exile_Character_Editor_private.res
OBJ = graphutl.o bladpced.o dlogtool.o edaction.o edfileio.o editors.o edsound.o global.o graphics.o $(RES)
LINKOBJ = graphutl.o bladpced.o dlogtool.o edaction.o edfileio.o editors.o edsound.o global.o graphics.o $(RES)
LIBS = -lwinmm -mwindows -lwinmm
INCS = -I"include"
CXXINCS =
BIN = "Blades of Exile Character Editor.exe"
CXXFLAGS = $(CXXINCS) -Wall -O2
CFLAGS = $(INCS) -O2
RM = rm -f
.PHONY: all all-before all-after clean clean-custom
all: all-before "Blades of Exile Character Editor.exe" all-after
clean: clean-custom
${RM} $(OBJ) $(BIN)
$(BIN): $(OBJ)
$(CPP) $(LINKOBJ) -o "Blades of Exile Character Editor.exe" $(LIBS)
graphutl.o: graphutl.cpp
$(CPP) -c graphutl.cpp -o graphutl.o $(CXXFLAGS)
bladpced.o: bladpced.cpp
$(CPP) -c bladpced.cpp -o bladpced.o $(CXXFLAGS)
dlogtool.o: dlogtool.cpp
$(CPP) -c dlogtool.cpp -o dlogtool.o $(CXXFLAGS)
edaction.o: edaction.cpp
$(CPP) -c edaction.cpp -o edaction.o $(CXXFLAGS)
edfileio.o: edfileio.cpp
$(CPP) -c edfileio.cpp -o edfileio.o $(CXXFLAGS)
editors.o: editors.cpp
$(CPP) -c editors.cpp -o editors.o $(CXXFLAGS)
edsound.o: edsound.cpp
$(CPP) -c edsound.cpp -o edsound.o $(CXXFLAGS)
global.o: global.cpp
$(CPP) -c global.cpp -o global.o $(CXXFLAGS)
graphics.o: graphics.cpp
$(CPP) -c graphics.cpp -o graphics.o $(CXXFLAGS)
Blades_of_Exile_Character_Editor_private.res: Blades_of_Exile_Character_Editor_private.rc BLADPCED.RC
$(WINDRES) -i Blades_of_Exile_Character_Editor_private.rc --input-format=rc -o Blades_of_Exile_Character_Editor_private.res -O coff

View File

@@ -1,111 +0,0 @@
# Project: Blades of Exile Win32
# Makefile created by Dev-C++ 4.9.9.2
CPP = amd64-mingw32msvc-g++
CC = amd64-mingw32msvc-gcc
WINDRES = amd64-mingw32msvc-windres
RES = Blades_of_Exile_private.res
OBJ = boe.actions.o boe.main.o boe.combat.o boe.dlgutil.o boe.fields.o boe.fileio.o global.o boe.graphics.o boe.graphutil.o boe.infodlg.o boe.itemdata.o boe.items.o boe.locutils.o boe.monster.o boe.newgraph.o boe.party.o boe.specials.o boe.text.o boe.town.o globvar.o tools/soundtool.o tools/soundvars.o tools/dlogtool.o tools/mathutil.o classes/item.o classes/location.o classes/pc.o $(RES)
LINKOBJ = boe.actions.o boe.main.o boe.combat.o boe.dlgutil.o boe.fields.o boe.fileio.o global.o boe.graphics.o boe.graphutil.o boe.infodlg.o boe.itemdata.o boe.items.o boe.locutils.o boe.monster.o boe.newgraph.o boe.party.o boe.specials.o boe.text.o boe.town.o globvar.o tools/soundtool.o tools/soundvars.o tools/dlogtool.o tools/mathutil.o classes/item.o classes/location.o classes/pc.o $(RES)
LIBS = -mwindows -lwinmm
INCS = -I"include"
CXXINCS =
BIN = "Blades of Exile.exe"
CXXFLAGS = $(CXXINCS) -Wall -O2
CFLAGS = $(INCS) -O2
RM = rm -f
.PHONY: all all-before all-after clean clean-custom
all: all-before "Blades of Exile.exe" all-after
clean: clean-custom
${RM} $(OBJ) $(BIN)
$(BIN): $(OBJ)
$(CPP) $(LINKOBJ) -o "Blades of Exile.exe" $(LIBS)
boe.actions.o: boe.actions.cpp
$(CPP) -c boe.actions.cpp -o boe.actions.o $(CXXFLAGS)
boe.main.o: boe.main.cpp
$(CPP) -c boe.main.cpp -o boe.main.o $(CXXFLAGS)
boe.combat.o: boe.combat.cpp
$(CPP) -c boe.combat.cpp -o boe.combat.o $(CXXFLAGS)
boe.dlgutil.o: boe.dlgutil.cpp
$(CPP) -c boe.dlgutil.cpp -o boe.dlgutil.o $(CXXFLAGS)
boe.fields.o: boe.fields.cpp
$(CPP) -c boe.fields.cpp -o boe.fields.o $(CXXFLAGS)
boe.fileio.o: boe.fileio.cpp
$(CPP) -c boe.fileio.cpp -o boe.fileio.o $(CXXFLAGS)
global.o: global.cpp
$(CPP) -c global.cpp -o global.o $(CXXFLAGS)
boe.graphics.o: boe.graphics.cpp
$(CPP) -c boe.graphics.cpp -o boe.graphics.o $(CXXFLAGS)
boe.graphutil.o: boe.graphutil.cpp
$(CPP) -c boe.graphutil.cpp -o boe.graphutil.o $(CXXFLAGS)
boe.infodlg.o: boe.infodlg.cpp
$(CPP) -c boe.infodlg.cpp -o boe.infodlg.o $(CXXFLAGS)
boe.itemdata.o: boe.itemdata.cpp
$(CPP) -c boe.itemdata.cpp -o boe.itemdata.o $(CXXFLAGS)
boe.items.o: boe.items.cpp
$(CPP) -c boe.items.cpp -o boe.items.o $(CXXFLAGS)
boe.locutils.o: boe.locutils.cpp
$(CPP) -c boe.locutils.cpp -o boe.locutils.o $(CXXFLAGS)
boe.monster.o: boe.monster.cpp
$(CPP) -c boe.monster.cpp -o boe.monster.o $(CXXFLAGS)
boe.newgraph.o: boe.newgraph.cpp
$(CPP) -c boe.newgraph.cpp -o boe.newgraph.o $(CXXFLAGS)
boe.party.o: boe.party.cpp
$(CPP) -c boe.party.cpp -o boe.party.o $(CXXFLAGS)
boe.specials.o: boe.specials.cpp
$(CPP) -c boe.specials.cpp -o boe.specials.o $(CXXFLAGS)
boe.text.o: boe.text.cpp
$(CPP) -c boe.text.cpp -o boe.text.o $(CXXFLAGS)
boe.town.o: boe.town.cpp
$(CPP) -c boe.town.cpp -o boe.town.o $(CXXFLAGS)
globvar.o: globvar.cpp
$(CPP) -c globvar.cpp -o globvar.o $(CXXFLAGS)
tools/soundtool.o: tools/soundtool.cpp
$(CPP) -c tools/soundtool.cpp -o tools/soundtool.o $(CXXFLAGS)
tools/soundvars.o: tools/soundvars.cpp
$(CPP) -c tools/soundvars.cpp -o tools/soundvars.o $(CXXFLAGS)
tools/dlogtool.o: tools/dlogtool.cpp
$(CPP) -c tools/dlogtool.cpp -o tools/dlogtool.o $(CXXFLAGS)
tools/mathutil.o: tools/mathutil.cpp
$(CPP) -c tools/mathutil.cpp -o tools/mathutil.o $(CXXFLAGS)
classes/item.o: classes/item.cpp
$(CPP) -c classes/item.cpp -o classes/item.o $(CXXFLAGS)
classes/location.o: classes/location.cpp
$(CPP) -c classes/location.cpp -o classes/location.o $(CXXFLAGS)
classes/pc.o: classes/pc.cpp
$(CPP) -c classes/pc.cpp -o classes/pc.o $(CXXFLAGS)
Blades_of_Exile_private.res: Blades_of_Exile_private.rc BLADES.RC GAMEDLOG.RC GAMESTR.RC
$(WINDRES) -i Blades_of_Exile_private.rc --input-format=rc -o Blades_of_Exile_private.res -O coff -D_INCLUDED_RC

View File

@@ -1,111 +0,0 @@
# Project: Blades of Exile Win32
# Makefile created by Dev-C++ 4.9.9.2
CPP = i586-mingw32msvc-g++
CC = i586-mingw32msvc-gcc
WINDRES = i586-mingw32msvc-windres
RES = Blades_of_Exile_private.res
OBJ = boe.actions.o boe.main.o boe.combat.o boe.dlgutil.o boe.fields.o boe.fileio.o global.o boe.graphics.o boe.graphutil.o boe.infodlg.o boe.itemdata.o boe.items.o boe.locutils.o boe.monster.o boe.newgraph.o boe.party.o boe.specials.o boe.text.o boe.town.o globvar.o tools/soundtool.o tools/soundvars.o tools/dlogtool.o tools/mathutil.o classes/item.o classes/location.o classes/pc.o $(RES)
LINKOBJ = boe.actions.o boe.main.o boe.combat.o boe.dlgutil.o boe.fields.o boe.fileio.o global.o boe.graphics.o boe.graphutil.o boe.infodlg.o boe.itemdata.o boe.items.o boe.locutils.o boe.monster.o boe.newgraph.o boe.party.o boe.specials.o boe.text.o boe.town.o globvar.o tools/soundtool.o tools/soundvars.o tools/dlogtool.o tools/mathutil.o classes/item.o classes/location.o classes/pc.o $(RES)
LIBS = -mwindows -lwinmm
INCS = -I"include"
CXXINCS =
BIN = "Blades of Exile.exe"
CXXFLAGS = $(CXXINCS) -Wall -O2
CFLAGS = $(INCS) -O2
RM = rm -f
.PHONY: all all-before all-after clean clean-custom
all: all-before "Blades of Exile.exe" all-after
clean: clean-custom
${RM} $(OBJ) $(BIN)
$(BIN): $(OBJ)
$(CPP) $(LINKOBJ) -o "Blades of Exile.exe" $(LIBS)
boe.actions.o: boe.actions.cpp
$(CPP) -c boe.actions.cpp -o boe.actions.o $(CXXFLAGS)
boe.main.o: boe.main.cpp
$(CPP) -c boe.main.cpp -o boe.main.o $(CXXFLAGS)
boe.combat.o: boe.combat.cpp
$(CPP) -c boe.combat.cpp -o boe.combat.o $(CXXFLAGS)
boe.dlgutil.o: boe.dlgutil.cpp
$(CPP) -c boe.dlgutil.cpp -o boe.dlgutil.o $(CXXFLAGS)
boe.fields.o: boe.fields.cpp
$(CPP) -c boe.fields.cpp -o boe.fields.o $(CXXFLAGS)
boe.fileio.o: boe.fileio.cpp
$(CPP) -c boe.fileio.cpp -o boe.fileio.o $(CXXFLAGS)
global.o: global.cpp
$(CPP) -c global.cpp -o global.o $(CXXFLAGS)
boe.graphics.o: boe.graphics.cpp
$(CPP) -c boe.graphics.cpp -o boe.graphics.o $(CXXFLAGS)
boe.graphutil.o: boe.graphutil.cpp
$(CPP) -c boe.graphutil.cpp -o boe.graphutil.o $(CXXFLAGS)
boe.infodlg.o: boe.infodlg.cpp
$(CPP) -c boe.infodlg.cpp -o boe.infodlg.o $(CXXFLAGS)
boe.itemdata.o: boe.itemdata.cpp
$(CPP) -c boe.itemdata.cpp -o boe.itemdata.o $(CXXFLAGS)
boe.items.o: boe.items.cpp
$(CPP) -c boe.items.cpp -o boe.items.o $(CXXFLAGS)
boe.locutils.o: boe.locutils.cpp
$(CPP) -c boe.locutils.cpp -o boe.locutils.o $(CXXFLAGS)
boe.monster.o: boe.monster.cpp
$(CPP) -c boe.monster.cpp -o boe.monster.o $(CXXFLAGS)
boe.newgraph.o: boe.newgraph.cpp
$(CPP) -c boe.newgraph.cpp -o boe.newgraph.o $(CXXFLAGS)
boe.party.o: boe.party.cpp
$(CPP) -c boe.party.cpp -o boe.party.o $(CXXFLAGS)
boe.specials.o: boe.specials.cpp
$(CPP) -c boe.specials.cpp -o boe.specials.o $(CXXFLAGS)
boe.text.o: boe.text.cpp
$(CPP) -c boe.text.cpp -o boe.text.o $(CXXFLAGS)
boe.town.o: boe.town.cpp
$(CPP) -c boe.town.cpp -o boe.town.o $(CXXFLAGS)
globvar.o: globvar.cpp
$(CPP) -c globvar.cpp -o globvar.o $(CXXFLAGS)
tools/soundtool.o: tools/soundtool.cpp
$(CPP) -c tools/soundtool.cpp -o tools/soundtool.o $(CXXFLAGS)
tools/soundvars.o: tools/soundvars.cpp
$(CPP) -c tools/soundvars.cpp -o tools/soundvars.o $(CXXFLAGS)
tools/dlogtool.o: tools/dlogtool.cpp
$(CPP) -c tools/dlogtool.cpp -o tools/dlogtool.o $(CXXFLAGS)
tools/mathutil.o: tools/mathutil.cpp
$(CPP) -c tools/mathutil.cpp -o tools/mathutil.o $(CXXFLAGS)
classes/item.o: classes/item.cpp
$(CPP) -c classes/item.cpp -o classes/item.o $(CXXFLAGS)
classes/location.o: classes/location.cpp
$(CPP) -c classes/location.cpp -o classes/location.o $(CXXFLAGS)
classes/pc.o: classes/pc.cpp
$(CPP) -c classes/pc.cpp -o classes/pc.o $(CXXFLAGS)
Blades_of_Exile_private.res: Blades_of_Exile_private.rc BLADES.RC GAMEDLOG.RC GAMESTR.RC
$(WINDRES) -i Blades_of_Exile_private.rc --input-format=rc -o Blades_of_Exile_private.res -O coff -D_INCLUDED_RC

View File

@@ -1,66 +0,0 @@
# Project: Blades of Exile Scenario Editor
# Makefile created by Dev-C++ 4.9.9.2
CPP = amd64-mingw32msvc-g++
CC = amd64-mingw32msvc-gcc
WINDRES = amd64-mingw32msvc-windres
RES = Blades_of_Exile_Scenario_Editor_private.res
OBJ = buttonmg.o dlogtool.o global.o graphutl.o keydlgs.o tfileio.o townout.o edsound.o graphics.o scenario.o blscened.o tactions.o $(RES)
LINKOBJ = buttonmg.o dlogtool.o global.o graphutl.o keydlgs.o tfileio.o townout.o edsound.o graphics.o scenario.o blscened.o tactions.o $(RES)
LIBS = -mwindows -lwinmm --strip-all
INCS = -I"include"
CXXINCS =
BIN = "Blades of Exile Scenario Editor.exe"
CXXFLAGS = $(CXXINCS) -fno-exceptions -fno-rtti
CFLAGS = $(INCS)
RM = rm -f
.PHONY: all all-before all-after clean clean-custom
all: all-before "Blades of Exile Scenario Editor.exe" all-after
clean: clean-custom
${RM} $(OBJ) $(BIN)
$(BIN): $(OBJ)
$(CPP) $(LINKOBJ) -o "Blades of Exile Scenario Editor.exe" $(LIBS)
buttonmg.o: buttonmg.cpp
$(CPP) -c buttonmg.cpp -o buttonmg.o $(CXXFLAGS)
dlogtool.o: dlogtool.cpp
$(CPP) -c dlogtool.cpp -o dlogtool.o $(CXXFLAGS)
global.o: global.cpp
$(CPP) -c global.cpp -o global.o $(CXXFLAGS)
graphutl.o: graphutl.cpp
$(CPP) -c graphutl.cpp -o graphutl.o $(CXXFLAGS)
keydlgs.o: keydlgs.cpp
$(CPP) -c keydlgs.cpp -o keydlgs.o $(CXXFLAGS)
tfileio.o: tfileio.cpp
$(CPP) -c tfileio.cpp -o tfileio.o $(CXXFLAGS)
townout.o: townout.cpp
$(CPP) -c townout.cpp -o townout.o $(CXXFLAGS)
edsound.o: edsound.cpp
$(CPP) -c edsound.cpp -o edsound.o $(CXXFLAGS)
graphics.o: graphics.cpp
$(CPP) -c graphics.cpp -o graphics.o $(CXXFLAGS)
scenario.o: scenario.cpp
$(CPP) -c scenario.cpp -o scenario.o $(CXXFLAGS)
blscened.o: blscened.cpp
$(CPP) -c blscened.cpp -o blscened.o $(CXXFLAGS)
tactions.o: tactions.cpp
$(CPP) -c tactions.cpp -o tactions.o $(CXXFLAGS)
Blades_of_Exile_Scenario_Editor_private.res: Blades_of_Exile_Scenario_Editor_private.rc STRINGS.RC BLSCENED.RC GAMEDLOG.RC
$(WINDRES) -i Blades_of_Exile_Scenario_Editor_private.rc --input-format=rc -o Blades_of_Exile_Scenario_Editor_private.res -O coff -D_INCLUDED_RC

View File

@@ -1,66 +0,0 @@
# Project: Blades of Exile Scenario Editor
# Makefile created by Dev-C++ 4.9.9.2
CPP = i586-mingw32msvc-g++
CC = i586-mingw32msvc-gcc
WINDRES = i586-mingw32msvc-windres
RES = Blades_of_Exile_Scenario_Editor_private.res
OBJ = buttonmg.o dlogtool.o global.o graphutl.o keydlgs.o tfileio.o townout.o edsound.o graphics.o scenario.o blscened.o tactions.o $(RES)
LINKOBJ = buttonmg.o dlogtool.o global.o graphutl.o keydlgs.o tfileio.o townout.o edsound.o graphics.o scenario.o blscened.o tactions.o $(RES)
LIBS = -mwindows -lwinmm --strip-all
INCS = -I"include"
CXXINCS =
BIN = "Blades of Exile Scenario Editor.exe"
CXXFLAGS = $(CXXINCS) -fno-exceptions -fno-rtti
CFLAGS = $(INCS)
RM = rm -f
.PHONY: all all-before all-after clean clean-custom
all: all-before "Blades of Exile Scenario Editor.exe" all-after
clean: clean-custom
${RM} $(OBJ) $(BIN)
$(BIN): $(OBJ)
$(CPP) $(LINKOBJ) -o "Blades of Exile Scenario Editor.exe" $(LIBS)
buttonmg.o: buttonmg.cpp
$(CPP) -c buttonmg.cpp -o buttonmg.o $(CXXFLAGS)
dlogtool.o: dlogtool.cpp
$(CPP) -c dlogtool.cpp -o dlogtool.o $(CXXFLAGS)
global.o: global.cpp
$(CPP) -c global.cpp -o global.o $(CXXFLAGS)
graphutl.o: graphutl.cpp
$(CPP) -c graphutl.cpp -o graphutl.o $(CXXFLAGS)
keydlgs.o: keydlgs.cpp
$(CPP) -c keydlgs.cpp -o keydlgs.o $(CXXFLAGS)
tfileio.o: tfileio.cpp
$(CPP) -c tfileio.cpp -o tfileio.o $(CXXFLAGS)
townout.o: townout.cpp
$(CPP) -c townout.cpp -o townout.o $(CXXFLAGS)
edsound.o: edsound.cpp
$(CPP) -c edsound.cpp -o edsound.o $(CXXFLAGS)
graphics.o: graphics.cpp
$(CPP) -c graphics.cpp -o graphics.o $(CXXFLAGS)
scenario.o: scenario.cpp
$(CPP) -c scenario.cpp -o scenario.o $(CXXFLAGS)
blscened.o: blscened.cpp
$(CPP) -c blscened.cpp -o blscened.o $(CXXFLAGS)
tactions.o: tactions.cpp
$(CPP) -c tactions.cpp -o tactions.o $(CXXFLAGS)
Blades_of_Exile_Scenario_Editor_private.res: Blades_of_Exile_Scenario_Editor_private.rc STRINGS.RC BLSCENED.RC GAMEDLOG.RC
$(WINDRES) -i Blades_of_Exile_Scenario_Editor_private.rc --input-format=rc -o Blades_of_Exile_Scenario_Editor_private.res -O coff -D_INCLUDED_RC

28
Win32/boesounds/Makefile Normal file
View File

@@ -0,0 +1,28 @@
include ../.config.vars
CPP = $(PREFIX)g++
CC = $(PREFIX)gcc
WINDRES = $(PREFIX)windres
RES = Blades_of_Exile_private.res
INCS = -I"include"
CXXINCS =
BIN = boesounds.dll
CXXFLAGS = $(CXXINCS) -Wall -O2 -g
RM = rm -f
.PHONY: all all-before all-after clean clean-custom
all: all-before boesounds.dll all-after
clean: clean-custom
${RM} dllmain.o $(BIN)
$(BIN): BOESOUNDS.res dllmain.o
$(CPP) -shared -Wl,--dll dllmain.o BOESOUNDS.res -o boesounds.dll
dllmain.o: dllmain.cpp
$(CPP) -c dllmain.cpp -o dllmain.o $(CXXFLAGS)
BOESOUNDS.res: BOESOUNDS.RC
$(WINDRES) -J rc -O coff -i BOESOUNDS.RC -o BOESOUNDS.res

Some files were not shown because too many files have changed in this diff Show More