From 29906153cf725a0daf0df27812fc3dd67dde6203 Mon Sep 17 00:00:00 2001 From: Sylae Jiendra Corell Date: Tue, 17 Jun 2014 14:36:17 -0600 Subject: [PATCH 1/7] Configure file, partial 64-bit support Thanks to @redsaurus we've now got (partial) 64-bit support. The game and sounds dll now compile under x64. I've also added a simple python configure script (based off of Arancaytar's cburschka/cadence script) to quickly allow changing compilers. Gone are the days of three different Makefiles! --- .gitignore | 6 +- .../{Makefile-DevCpp.win => Makefile} | 13 +- Win32/Blades of Exile/Makefile-Nightly-amd64 | 111 ------------------ Win32/Blades of Exile/Makefile-Nightly-i586 | 111 ------------------ Win32/Blades of Exile/boe.actions.h | 4 +- Win32/Blades of Exile/boe.dlgutil.cpp | 4 +- Win32/Blades of Exile/boe.fileio.cpp | 4 +- Win32/Blades of Exile/boe.main.cpp | 2 +- Win32/Blades of Exile/boe.main.h | 2 +- Win32/Blades of Exile/tools/dlogtool.cpp | 12 +- Win32/Blades of Exile/tools/dlogtool.h | 6 +- Win32/Boesounds DLL/Makefile | 28 +++++ .../sounds/{SND0.WAV => snd0.wav} | Bin .../sounds/{SND1.WAV => snd1.wav} | Bin .../sounds/{SND10.WAV => snd10.wav} | Bin .../sounds/{SND11.WAV => snd11.wav} | Bin .../sounds/{SND12.WAV => snd12.wav} | Bin .../sounds/{SND13.WAV => snd13.wav} | Bin .../sounds/{SND14.WAV => snd14.wav} | Bin .../sounds/{SND15.WAV => snd15.wav} | Bin .../sounds/{SND16.WAV => snd16.wav} | Bin .../sounds/{SND17.WAV => snd17.wav} | Bin .../sounds/{SND18.WAV => snd18.wav} | Bin .../sounds/{SND19.WAV => snd19.wav} | Bin .../sounds/{SND2.WAV => snd2.wav} | Bin .../sounds/{SND20.WAV => snd20.wav} | Bin .../sounds/{SND21.WAV => snd21.wav} | Bin .../sounds/{SND22.WAV => snd22.wav} | Bin .../sounds/{SND23.WAV => snd23.wav} | Bin .../sounds/{SND24.WAV => snd24.wav} | Bin .../sounds/{SND25.WAV => snd25.wav} | Bin .../sounds/{SND26.WAV => snd26.wav} | Bin .../sounds/{SND27.WAV => snd27.wav} | Bin .../sounds/{SND28.WAV => snd28.wav} | Bin .../sounds/{SND29.WAV => snd29.wav} | Bin .../sounds/{SND3.WAV => snd3.wav} | Bin .../sounds/{SND30.WAV => snd30.wav} | Bin .../sounds/{SND31.WAV => snd31.wav} | Bin .../sounds/{SND32.WAV => snd32.wav} | Bin .../sounds/{SND33.WAV => snd33.wav} | Bin .../sounds/{SND34.WAV => snd34.wav} | Bin .../sounds/{SND35.WAV => snd35.wav} | Bin .../sounds/{SND36.WAV => snd36.wav} | Bin .../sounds/{SND37.WAV => snd37.wav} | Bin .../sounds/{SND38.WAV => snd38.wav} | Bin .../sounds/{SND39.WAV => snd39.wav} | Bin .../sounds/{SND4.WAV => snd4.wav} | Bin .../sounds/{SND40.WAV => snd40.wav} | Bin .../sounds/{SND41.WAV => snd41.wav} | Bin .../sounds/{SND42.WAV => snd42.wav} | Bin .../sounds/{SND43.WAV => snd43.wav} | Bin .../sounds/{SND44.WAV => snd44.wav} | Bin .../sounds/{SND45.WAV => snd45.wav} | Bin .../sounds/{SND46.WAV => snd46.wav} | Bin .../sounds/{SND47.WAV => snd47.wav} | Bin .../sounds/{SND48.WAV => snd48.wav} | Bin .../sounds/{SND49.WAV => snd49.wav} | Bin .../sounds/{SND5.WAV => snd5.wav} | Bin .../sounds/{SND50.WAV => snd50.wav} | Bin .../sounds/{SND51.WAV => snd51.wav} | Bin .../sounds/{SND52.WAV => snd52.wav} | Bin .../sounds/{SND53.WAV => snd53.wav} | Bin .../sounds/{SND54.WAV => snd54.wav} | Bin .../sounds/{SND55.WAV => snd55.wav} | Bin .../sounds/{SND56.WAV => snd56.wav} | Bin .../sounds/{SND57.WAV => snd57.wav} | Bin .../sounds/{SND58.WAV => snd58.wav} | Bin .../sounds/{SND59.WAV => snd59.wav} | Bin .../sounds/{SND6.WAV => snd6.wav} | Bin .../sounds/{SND60.WAV => snd60.wav} | Bin .../sounds/{SND61.WAV => snd61.wav} | Bin .../sounds/{SND62.WAV => snd62.wav} | Bin .../sounds/{SND63.WAV => snd63.wav} | Bin .../sounds/{SND64.WAV => snd64.wav} | Bin .../sounds/{SND65.WAV => snd65.wav} | Bin .../sounds/{SND66.WAV => snd66.wav} | Bin .../sounds/{SND67.WAV => snd67.wav} | Bin .../sounds/{SND68.WAV => snd68.wav} | Bin .../sounds/{SND69.WAV => snd69.wav} | Bin .../sounds/{SND7.WAV => snd7.wav} | Bin .../sounds/{SND70.WAV => snd70.wav} | Bin .../sounds/{SND71.WAV => snd71.wav} | Bin .../sounds/{SND72.WAV => snd72.wav} | Bin .../sounds/{SND73.WAV => snd73.wav} | Bin .../sounds/{SND74.WAV => snd74.wav} | Bin .../sounds/{SND75.WAV => snd75.wav} | Bin .../sounds/{SND76.WAV => snd76.wav} | Bin .../sounds/{SND77.WAV => snd77.wav} | Bin .../sounds/{SND78.WAV => snd78.wav} | Bin .../sounds/{SND79.WAV => snd79.wav} | Bin .../sounds/{SND8.WAV => snd8.wav} | Bin .../sounds/{SND80.WAV => snd80.wav} | Bin .../sounds/{SND81.WAV => snd81.wav} | Bin .../sounds/{SND82.WAV => snd82.wav} | Bin .../sounds/{SND83.WAV => snd83.wav} | Bin .../sounds/{SND84.WAV => snd84.wav} | Bin .../sounds/{SND85.WAV => snd85.wav} | Bin .../sounds/{SND86.WAV => snd86.wav} | Bin .../sounds/{SND87.WAV => snd87.wav} | Bin .../sounds/{SND88.WAV => snd88.wav} | Bin .../sounds/{SND89.WAV => snd89.wav} | Bin .../sounds/{SND9.WAV => snd9.wav} | Bin .../sounds/{SND90.WAV => snd90.wav} | Bin .../sounds/{SND91.WAV => snd91.wav} | Bin .../sounds/{SND92.WAV => snd92.wav} | Bin .../sounds/{SND93.WAV => snd93.wav} | Bin .../sounds/{SND94.WAV => snd94.wav} | Bin .../sounds/{SND95.WAV => snd95.wav} | Bin .../sounds/{SND96.WAV => snd96.wav} | Bin .../sounds/{SND97.WAV => snd97.wav} | Bin .../sounds/{SND98.WAV => snd98.wav} | Bin .../sounds/{SND99.WAV => snd99.wav} | Bin Win32/configure | 30 +++++ 113 files changed, 86 insertions(+), 247 deletions(-) rename Win32/Blades of Exile/{Makefile-DevCpp.win => Makefile} (92%) delete mode 100644 Win32/Blades of Exile/Makefile-Nightly-amd64 delete mode 100644 Win32/Blades of Exile/Makefile-Nightly-i586 create mode 100644 Win32/Boesounds DLL/Makefile rename Win32/Boesounds DLL/sounds/{SND0.WAV => snd0.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND1.WAV => snd1.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND10.WAV => snd10.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND11.WAV => snd11.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND12.WAV => snd12.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND13.WAV => snd13.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND14.WAV => snd14.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND15.WAV => snd15.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND16.WAV => snd16.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND17.WAV => snd17.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND18.WAV => snd18.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND19.WAV => snd19.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND2.WAV => snd2.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND20.WAV => snd20.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND21.WAV => snd21.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND22.WAV => snd22.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND23.WAV => snd23.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND24.WAV => snd24.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND25.WAV => snd25.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND26.WAV => snd26.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND27.WAV => snd27.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND28.WAV => snd28.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND29.WAV => snd29.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND3.WAV => snd3.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND30.WAV => snd30.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND31.WAV => snd31.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND32.WAV => snd32.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND33.WAV => snd33.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND34.WAV => snd34.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND35.WAV => snd35.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND36.WAV => snd36.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND37.WAV => snd37.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND38.WAV => snd38.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND39.WAV => snd39.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND4.WAV => snd4.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND40.WAV => snd40.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND41.WAV => snd41.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND42.WAV => snd42.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND43.WAV => snd43.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND44.WAV => snd44.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND45.WAV => snd45.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND46.WAV => snd46.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND47.WAV => snd47.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND48.WAV => snd48.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND49.WAV => snd49.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND5.WAV => snd5.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND50.WAV => snd50.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND51.WAV => snd51.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND52.WAV => snd52.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND53.WAV => snd53.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND54.WAV => snd54.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND55.WAV => snd55.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND56.WAV => snd56.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND57.WAV => snd57.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND58.WAV => snd58.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND59.WAV => snd59.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND6.WAV => snd6.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND60.WAV => snd60.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND61.WAV => snd61.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND62.WAV => snd62.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND63.WAV => snd63.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND64.WAV => snd64.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND65.WAV => snd65.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND66.WAV => snd66.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND67.WAV => snd67.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND68.WAV => snd68.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND69.WAV => snd69.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND7.WAV => snd7.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND70.WAV => snd70.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND71.WAV => snd71.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND72.WAV => snd72.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND73.WAV => snd73.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND74.WAV => snd74.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND75.WAV => snd75.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND76.WAV => snd76.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND77.WAV => snd77.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND78.WAV => snd78.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND79.WAV => snd79.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND8.WAV => snd8.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND80.WAV => snd80.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND81.WAV => snd81.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND82.WAV => snd82.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND83.WAV => snd83.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND84.WAV => snd84.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND85.WAV => snd85.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND86.WAV => snd86.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND87.WAV => snd87.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND88.WAV => snd88.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND89.WAV => snd89.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND9.WAV => snd9.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND90.WAV => snd90.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND91.WAV => snd91.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND92.WAV => snd92.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND93.WAV => snd93.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND94.WAV => snd94.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND95.WAV => snd95.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND96.WAV => snd96.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND97.WAV => snd97.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND98.WAV => snd98.wav} (100%) rename Win32/Boesounds DLL/sounds/{SND99.WAV => snd99.wav} (100%) create mode 100755 Win32/configure diff --git a/.gitignore b/.gitignore index 691610b5..619ef3d8 100644 --- a/.gitignore +++ b/.gitignore @@ -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 \ No newline at end of file +*blades.ini + +.config.vars diff --git a/Win32/Blades of Exile/Makefile-DevCpp.win b/Win32/Blades of Exile/Makefile similarity index 92% rename from Win32/Blades of Exile/Makefile-DevCpp.win rename to Win32/Blades of Exile/Makefile index 148582bf..9ac67f4d 100644 --- a/Win32/Blades of Exile/Makefile-DevCpp.win +++ b/Win32/Blades of Exile/Makefile @@ -1,17 +1,16 @@ -# Project: Blades of Exile Win32 -# Makefile created by Dev-C++ 4.9.9.2 +include ../.config.vars -CPP = g++.exe -CC = gcc.exe -WINDRES = windres.exe +CPP = $(PREFIX)g++ +CC = $(PREFIX)gcc +WINDRES = $(PREFIX)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 +LIBS = -mwindows -lwinmm -static-libgcc -static-libstdc++ INCS = -I"include" CXXINCS = BIN = "Blades of Exile.exe" -CXXFLAGS = $(CXXINCS) -Wall -O2 +CXXFLAGS = $(CXXINCS) -Wall -O2 -v CFLAGS = $(INCS) -O2 RM = rm -f diff --git a/Win32/Blades of Exile/Makefile-Nightly-amd64 b/Win32/Blades of Exile/Makefile-Nightly-amd64 deleted file mode 100644 index 14314d45..00000000 --- a/Win32/Blades of Exile/Makefile-Nightly-amd64 +++ /dev/null @@ -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 diff --git a/Win32/Blades of Exile/Makefile-Nightly-i586 b/Win32/Blades of Exile/Makefile-Nightly-i586 deleted file mode 100644 index 778d3443..00000000 --- a/Win32/Blades of Exile/Makefile-Nightly-i586 +++ /dev/null @@ -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 diff --git a/Win32/Blades of Exile/boe.actions.h b/Win32/Blades of Exile/boe.actions.h index b3c26ca0..3eda914d 100644 --- a/Win32/Blades of Exile/boe.actions.h +++ b/Win32/Blades of Exile/boe.actions.h @@ -11,8 +11,8 @@ void button_flash_rect(RECT to_flash); void handle_menu_spell(short spell_picked,short spell_type) ; void initiate_outdoor_combat(short i); void initiate_redraw(); -Boolean handle_syskeystroke(UINT wParam,LONG lParam,short *handled); -Boolean handle_keystroke(UINT wParam,LONG lParam); +Boolean handle_syskeystroke(WPARAM wParam,LPARAM lParam,short *handled); +Boolean handle_keystroke(WPARAM wParam,LPARAM lParam); void menu_activate( short type); void do_load(); void post_load(); diff --git a/Win32/Blades of Exile/boe.dlgutil.cpp b/Win32/Blades of Exile/boe.dlgutil.cpp index 4509a0e7..bac89047 100644 --- a/Win32/Blades of Exile/boe.dlgutil.cpp +++ b/Win32/Blades of Exile/boe.dlgutil.cpp @@ -444,8 +444,8 @@ void start_talk_mode(short m_num,short personality,unsigned char monst_type,shor 20, mainPtr,(HMENU) 160,(HINSTANCE) store_hInstance,NULL); store_edit_parent = mainPtr; - old_edit_proc = (WNDPROC) (GetWindowLong(talk_edit_box,GWL_WNDPROC)); - SetWindowLong(talk_edit_box,GWL_WNDPROC,(LONG) edit_proc); + old_edit_proc = (WNDPROC) (GetWindowLongPtr(talk_edit_box,GWLP_WNDPROC)); + SetWindowLongPtr(talk_edit_box,GWLP_WNDPROC,(LONG_PTR) edit_proc); SetFocus(talk_edit_box); } diff --git a/Win32/Blades of Exile/boe.fileio.cpp b/Win32/Blades of Exile/boe.fileio.cpp index bdb910f7..b6e7d53b 100644 --- a/Win32/Blades of Exile/boe.fileio.cpp +++ b/Win32/Blades of Exile/boe.fileio.cpp @@ -1933,7 +1933,7 @@ void build_scen_headers() 0,0,0,0, // 7 mainPtr, // 8 (HMENU) 1, // 9 - (HINSTANCE) GetWindowLong(mainPtr, GWL_HINSTANCE), // 10 + (HINSTANCE) GetWindowLongPtr(mainPtr, GWLP_HINSTANCE), // 10 NULL); // 11 ListFiles("", listbox);//First list the scenarios under the scenarios folder @@ -1965,7 +1965,7 @@ void build_scen_headers() for (i = 0; i < count; i++) { - SendMessage(listbox,LB_GETTEXT,i,(LONG) (LPSTR) filename2); + SendMessage(listbox,LB_GETTEXT,i,(LONG_PTR) (LPSTR) filename2); sprintf(filename,"scenarios/%s",filename2); diff --git a/Win32/Blades of Exile/boe.main.cpp b/Win32/Blades of Exile/boe.main.cpp index c2dea738..24cb21f5 100644 --- a/Win32/Blades of Exile/boe.main.cpp +++ b/Win32/Blades of Exile/boe.main.cpp @@ -306,7 +306,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR, int nCmd return msg.wParam; } -long CALLBACK WndProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +LRESULT CALLBACK WndProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { HDC hdc; PAINTSTRUCT ps; diff --git a/Win32/Blades of Exile/boe.main.h b/Win32/Blades of Exile/boe.main.h index 08043a72..3ee5ec0d 100644 --- a/Win32/Blades of Exile/boe.main.h +++ b/Win32/Blades of Exile/boe.main.h @@ -10,6 +10,6 @@ void load_cursors(); void change_cursor(POINT where_curs); void cursor_go(); void cursor_stay(); -long CALLBACK WndProc (HWND, UINT, WPARAM, LPARAM); +LRESULT CALLBACK WndProc (HWND, UINT, WPARAM, LPARAM); #endif diff --git a/Win32/Blades of Exile/tools/dlogtool.cpp b/Win32/Blades of Exile/tools/dlogtool.cpp index 36ced277..638b9c8a 100644 --- a/Win32/Blades of Exile/tools/dlogtool.cpp +++ b/Win32/Blades of Exile/tools/dlogtool.cpp @@ -47,10 +47,10 @@ short item_label_loc[NI]; inline void cd_kill_dc(short which_slot,HDC hdc) { fry_dc(dlgs[which_slot],hdc); } -BOOL CALLBACK dummy_dialog_proc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +LRESULT CALLBACK dummy_dialog_proc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); LRESULT CALLBACK fresh_edit_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); -long CALLBACK WndProc (HWND, UINT, WPARAM, LPARAM); +LRESULT CALLBACK WndProc (HWND, UINT, WPARAM, LPARAM); void cd_init_dialogs() { @@ -70,7 +70,7 @@ void cd_init_dialogs() edit_proc = fresh_edit_proc; } -long CALLBACK fresh_edit_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +LRESULT CALLBACK fresh_edit_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { if(hwnd == talk_edit_box){ switch (message) { @@ -542,7 +542,7 @@ short cd_create_dialog(short dlog_num, HWND parent) return 0; } -BOOL CALLBACK dummy_dialog_proc (HWND hDlg, UINT message, WPARAM, LPARAM) +LRESULT CALLBACK dummy_dialog_proc (HWND hDlg, UINT message, WPARAM, LPARAM) { short i,j,k,free_slot = -1,free_item = -1; int type, flag; @@ -728,8 +728,8 @@ BOOL CALLBACK dummy_dialog_proc (HWND hDlg, UINT message, WPARAM, LPARAM) item_rect[free_item].bottom - item_rect[free_item].top, dlgs[free_slot],(HMENU) 150,(HINSTANCE) store_hInstance,NULL); store_edit_parent = dlgs[free_slot]; - old_edit_proc = (WNDPROC) (GetWindowLong(edit_box,GWL_WNDPROC)); - SetWindowLong(edit_box,GWL_WNDPROC,(LONG) edit_proc); + old_edit_proc = (WNDPROC) (GetWindowLongPtr(edit_box,GWLP_WNDPROC)); + SetWindowLongPtr(edit_box,GWLP_WNDPROC,(LONG_PTR) edit_proc); break; } win_height = max(win_height, item_rect[free_item].bottom + 28 + 6); diff --git a/Win32/Blades of Exile/tools/dlogtool.h b/Win32/Blades of Exile/tools/dlogtool.h index c69e9d06..f6b6e2a2 100644 --- a/Win32/Blades of Exile/tools/dlogtool.h +++ b/Win32/Blades of Exile/tools/dlogtool.h @@ -14,9 +14,9 @@ short cd_create_dialog_parent_num(short dlog_num,short parent); void cd_init_dialogs(); short cd_create_dialog(short dlog_num,HWND parent) ; short cd_kill_dialog(short dlog_num,short parent_message); -short cd_process_click(HWND window,POINT the_point, UINT wparam, LONG lparam,short *item); -short cd_process_syskeystroke(HWND window,UINT wparam, LONG lparam,short *item); -short cd_process_keystroke(HWND window,UINT wparam, LONG lparam,short *item); +short cd_process_click(HWND window,POINT the_point, WPARAM wparam, LPARAM lparam,short *item); +short cd_process_syskeystroke(HWND window,WPARAM wparam, LPARAM lparam,short *item); +short cd_process_keystroke(HWND window,WPARAM wparam, LPARAM lparam,short *item); void cd_attach_key(short dlog_num,short item_num,char key); void cd_set_pict(short dlog_num, short item_num, short pict_num); void cd_activate_item(short dlog_num, short item_num, short status); diff --git a/Win32/Boesounds DLL/Makefile b/Win32/Boesounds DLL/Makefile new file mode 100644 index 00000000..58cadbb6 --- /dev/null +++ b/Win32/Boesounds DLL/Makefile @@ -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 diff --git a/Win32/Boesounds DLL/sounds/SND0.WAV b/Win32/Boesounds DLL/sounds/snd0.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND0.WAV rename to Win32/Boesounds DLL/sounds/snd0.wav diff --git a/Win32/Boesounds DLL/sounds/SND1.WAV b/Win32/Boesounds DLL/sounds/snd1.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND1.WAV rename to Win32/Boesounds DLL/sounds/snd1.wav diff --git a/Win32/Boesounds DLL/sounds/SND10.WAV b/Win32/Boesounds DLL/sounds/snd10.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND10.WAV rename to Win32/Boesounds DLL/sounds/snd10.wav diff --git a/Win32/Boesounds DLL/sounds/SND11.WAV b/Win32/Boesounds DLL/sounds/snd11.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND11.WAV rename to Win32/Boesounds DLL/sounds/snd11.wav diff --git a/Win32/Boesounds DLL/sounds/SND12.WAV b/Win32/Boesounds DLL/sounds/snd12.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND12.WAV rename to Win32/Boesounds DLL/sounds/snd12.wav diff --git a/Win32/Boesounds DLL/sounds/SND13.WAV b/Win32/Boesounds DLL/sounds/snd13.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND13.WAV rename to Win32/Boesounds DLL/sounds/snd13.wav diff --git a/Win32/Boesounds DLL/sounds/SND14.WAV b/Win32/Boesounds DLL/sounds/snd14.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND14.WAV rename to Win32/Boesounds DLL/sounds/snd14.wav diff --git a/Win32/Boesounds DLL/sounds/SND15.WAV b/Win32/Boesounds DLL/sounds/snd15.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND15.WAV rename to Win32/Boesounds DLL/sounds/snd15.wav diff --git a/Win32/Boesounds DLL/sounds/SND16.WAV b/Win32/Boesounds DLL/sounds/snd16.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND16.WAV rename to Win32/Boesounds DLL/sounds/snd16.wav diff --git a/Win32/Boesounds DLL/sounds/SND17.WAV b/Win32/Boesounds DLL/sounds/snd17.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND17.WAV rename to Win32/Boesounds DLL/sounds/snd17.wav diff --git a/Win32/Boesounds DLL/sounds/SND18.WAV b/Win32/Boesounds DLL/sounds/snd18.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND18.WAV rename to Win32/Boesounds DLL/sounds/snd18.wav diff --git a/Win32/Boesounds DLL/sounds/SND19.WAV b/Win32/Boesounds DLL/sounds/snd19.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND19.WAV rename to Win32/Boesounds DLL/sounds/snd19.wav diff --git a/Win32/Boesounds DLL/sounds/SND2.WAV b/Win32/Boesounds DLL/sounds/snd2.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND2.WAV rename to Win32/Boesounds DLL/sounds/snd2.wav diff --git a/Win32/Boesounds DLL/sounds/SND20.WAV b/Win32/Boesounds DLL/sounds/snd20.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND20.WAV rename to Win32/Boesounds DLL/sounds/snd20.wav diff --git a/Win32/Boesounds DLL/sounds/SND21.WAV b/Win32/Boesounds DLL/sounds/snd21.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND21.WAV rename to Win32/Boesounds DLL/sounds/snd21.wav diff --git a/Win32/Boesounds DLL/sounds/SND22.WAV b/Win32/Boesounds DLL/sounds/snd22.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND22.WAV rename to Win32/Boesounds DLL/sounds/snd22.wav diff --git a/Win32/Boesounds DLL/sounds/SND23.WAV b/Win32/Boesounds DLL/sounds/snd23.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND23.WAV rename to Win32/Boesounds DLL/sounds/snd23.wav diff --git a/Win32/Boesounds DLL/sounds/SND24.WAV b/Win32/Boesounds DLL/sounds/snd24.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND24.WAV rename to Win32/Boesounds DLL/sounds/snd24.wav diff --git a/Win32/Boesounds DLL/sounds/SND25.WAV b/Win32/Boesounds DLL/sounds/snd25.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND25.WAV rename to Win32/Boesounds DLL/sounds/snd25.wav diff --git a/Win32/Boesounds DLL/sounds/SND26.WAV b/Win32/Boesounds DLL/sounds/snd26.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND26.WAV rename to Win32/Boesounds DLL/sounds/snd26.wav diff --git a/Win32/Boesounds DLL/sounds/SND27.WAV b/Win32/Boesounds DLL/sounds/snd27.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND27.WAV rename to Win32/Boesounds DLL/sounds/snd27.wav diff --git a/Win32/Boesounds DLL/sounds/SND28.WAV b/Win32/Boesounds DLL/sounds/snd28.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND28.WAV rename to Win32/Boesounds DLL/sounds/snd28.wav diff --git a/Win32/Boesounds DLL/sounds/SND29.WAV b/Win32/Boesounds DLL/sounds/snd29.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND29.WAV rename to Win32/Boesounds DLL/sounds/snd29.wav diff --git a/Win32/Boesounds DLL/sounds/SND3.WAV b/Win32/Boesounds DLL/sounds/snd3.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND3.WAV rename to Win32/Boesounds DLL/sounds/snd3.wav diff --git a/Win32/Boesounds DLL/sounds/SND30.WAV b/Win32/Boesounds DLL/sounds/snd30.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND30.WAV rename to Win32/Boesounds DLL/sounds/snd30.wav diff --git a/Win32/Boesounds DLL/sounds/SND31.WAV b/Win32/Boesounds DLL/sounds/snd31.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND31.WAV rename to Win32/Boesounds DLL/sounds/snd31.wav diff --git a/Win32/Boesounds DLL/sounds/SND32.WAV b/Win32/Boesounds DLL/sounds/snd32.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND32.WAV rename to Win32/Boesounds DLL/sounds/snd32.wav diff --git a/Win32/Boesounds DLL/sounds/SND33.WAV b/Win32/Boesounds DLL/sounds/snd33.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND33.WAV rename to Win32/Boesounds DLL/sounds/snd33.wav diff --git a/Win32/Boesounds DLL/sounds/SND34.WAV b/Win32/Boesounds DLL/sounds/snd34.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND34.WAV rename to Win32/Boesounds DLL/sounds/snd34.wav diff --git a/Win32/Boesounds DLL/sounds/SND35.WAV b/Win32/Boesounds DLL/sounds/snd35.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND35.WAV rename to Win32/Boesounds DLL/sounds/snd35.wav diff --git a/Win32/Boesounds DLL/sounds/SND36.WAV b/Win32/Boesounds DLL/sounds/snd36.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND36.WAV rename to Win32/Boesounds DLL/sounds/snd36.wav diff --git a/Win32/Boesounds DLL/sounds/SND37.WAV b/Win32/Boesounds DLL/sounds/snd37.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND37.WAV rename to Win32/Boesounds DLL/sounds/snd37.wav diff --git a/Win32/Boesounds DLL/sounds/SND38.WAV b/Win32/Boesounds DLL/sounds/snd38.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND38.WAV rename to Win32/Boesounds DLL/sounds/snd38.wav diff --git a/Win32/Boesounds DLL/sounds/SND39.WAV b/Win32/Boesounds DLL/sounds/snd39.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND39.WAV rename to Win32/Boesounds DLL/sounds/snd39.wav diff --git a/Win32/Boesounds DLL/sounds/SND4.WAV b/Win32/Boesounds DLL/sounds/snd4.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND4.WAV rename to Win32/Boesounds DLL/sounds/snd4.wav diff --git a/Win32/Boesounds DLL/sounds/SND40.WAV b/Win32/Boesounds DLL/sounds/snd40.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND40.WAV rename to Win32/Boesounds DLL/sounds/snd40.wav diff --git a/Win32/Boesounds DLL/sounds/SND41.WAV b/Win32/Boesounds DLL/sounds/snd41.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND41.WAV rename to Win32/Boesounds DLL/sounds/snd41.wav diff --git a/Win32/Boesounds DLL/sounds/SND42.WAV b/Win32/Boesounds DLL/sounds/snd42.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND42.WAV rename to Win32/Boesounds DLL/sounds/snd42.wav diff --git a/Win32/Boesounds DLL/sounds/SND43.WAV b/Win32/Boesounds DLL/sounds/snd43.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND43.WAV rename to Win32/Boesounds DLL/sounds/snd43.wav diff --git a/Win32/Boesounds DLL/sounds/SND44.WAV b/Win32/Boesounds DLL/sounds/snd44.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND44.WAV rename to Win32/Boesounds DLL/sounds/snd44.wav diff --git a/Win32/Boesounds DLL/sounds/SND45.WAV b/Win32/Boesounds DLL/sounds/snd45.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND45.WAV rename to Win32/Boesounds DLL/sounds/snd45.wav diff --git a/Win32/Boesounds DLL/sounds/SND46.WAV b/Win32/Boesounds DLL/sounds/snd46.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND46.WAV rename to Win32/Boesounds DLL/sounds/snd46.wav diff --git a/Win32/Boesounds DLL/sounds/SND47.WAV b/Win32/Boesounds DLL/sounds/snd47.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND47.WAV rename to Win32/Boesounds DLL/sounds/snd47.wav diff --git a/Win32/Boesounds DLL/sounds/SND48.WAV b/Win32/Boesounds DLL/sounds/snd48.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND48.WAV rename to Win32/Boesounds DLL/sounds/snd48.wav diff --git a/Win32/Boesounds DLL/sounds/SND49.WAV b/Win32/Boesounds DLL/sounds/snd49.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND49.WAV rename to Win32/Boesounds DLL/sounds/snd49.wav diff --git a/Win32/Boesounds DLL/sounds/SND5.WAV b/Win32/Boesounds DLL/sounds/snd5.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND5.WAV rename to Win32/Boesounds DLL/sounds/snd5.wav diff --git a/Win32/Boesounds DLL/sounds/SND50.WAV b/Win32/Boesounds DLL/sounds/snd50.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND50.WAV rename to Win32/Boesounds DLL/sounds/snd50.wav diff --git a/Win32/Boesounds DLL/sounds/SND51.WAV b/Win32/Boesounds DLL/sounds/snd51.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND51.WAV rename to Win32/Boesounds DLL/sounds/snd51.wav diff --git a/Win32/Boesounds DLL/sounds/SND52.WAV b/Win32/Boesounds DLL/sounds/snd52.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND52.WAV rename to Win32/Boesounds DLL/sounds/snd52.wav diff --git a/Win32/Boesounds DLL/sounds/SND53.WAV b/Win32/Boesounds DLL/sounds/snd53.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND53.WAV rename to Win32/Boesounds DLL/sounds/snd53.wav diff --git a/Win32/Boesounds DLL/sounds/SND54.WAV b/Win32/Boesounds DLL/sounds/snd54.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND54.WAV rename to Win32/Boesounds DLL/sounds/snd54.wav diff --git a/Win32/Boesounds DLL/sounds/SND55.WAV b/Win32/Boesounds DLL/sounds/snd55.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND55.WAV rename to Win32/Boesounds DLL/sounds/snd55.wav diff --git a/Win32/Boesounds DLL/sounds/SND56.WAV b/Win32/Boesounds DLL/sounds/snd56.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND56.WAV rename to Win32/Boesounds DLL/sounds/snd56.wav diff --git a/Win32/Boesounds DLL/sounds/SND57.WAV b/Win32/Boesounds DLL/sounds/snd57.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND57.WAV rename to Win32/Boesounds DLL/sounds/snd57.wav diff --git a/Win32/Boesounds DLL/sounds/SND58.WAV b/Win32/Boesounds DLL/sounds/snd58.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND58.WAV rename to Win32/Boesounds DLL/sounds/snd58.wav diff --git a/Win32/Boesounds DLL/sounds/SND59.WAV b/Win32/Boesounds DLL/sounds/snd59.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND59.WAV rename to Win32/Boesounds DLL/sounds/snd59.wav diff --git a/Win32/Boesounds DLL/sounds/SND6.WAV b/Win32/Boesounds DLL/sounds/snd6.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND6.WAV rename to Win32/Boesounds DLL/sounds/snd6.wav diff --git a/Win32/Boesounds DLL/sounds/SND60.WAV b/Win32/Boesounds DLL/sounds/snd60.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND60.WAV rename to Win32/Boesounds DLL/sounds/snd60.wav diff --git a/Win32/Boesounds DLL/sounds/SND61.WAV b/Win32/Boesounds DLL/sounds/snd61.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND61.WAV rename to Win32/Boesounds DLL/sounds/snd61.wav diff --git a/Win32/Boesounds DLL/sounds/SND62.WAV b/Win32/Boesounds DLL/sounds/snd62.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND62.WAV rename to Win32/Boesounds DLL/sounds/snd62.wav diff --git a/Win32/Boesounds DLL/sounds/SND63.WAV b/Win32/Boesounds DLL/sounds/snd63.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND63.WAV rename to Win32/Boesounds DLL/sounds/snd63.wav diff --git a/Win32/Boesounds DLL/sounds/SND64.WAV b/Win32/Boesounds DLL/sounds/snd64.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND64.WAV rename to Win32/Boesounds DLL/sounds/snd64.wav diff --git a/Win32/Boesounds DLL/sounds/SND65.WAV b/Win32/Boesounds DLL/sounds/snd65.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND65.WAV rename to Win32/Boesounds DLL/sounds/snd65.wav diff --git a/Win32/Boesounds DLL/sounds/SND66.WAV b/Win32/Boesounds DLL/sounds/snd66.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND66.WAV rename to Win32/Boesounds DLL/sounds/snd66.wav diff --git a/Win32/Boesounds DLL/sounds/SND67.WAV b/Win32/Boesounds DLL/sounds/snd67.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND67.WAV rename to Win32/Boesounds DLL/sounds/snd67.wav diff --git a/Win32/Boesounds DLL/sounds/SND68.WAV b/Win32/Boesounds DLL/sounds/snd68.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND68.WAV rename to Win32/Boesounds DLL/sounds/snd68.wav diff --git a/Win32/Boesounds DLL/sounds/SND69.WAV b/Win32/Boesounds DLL/sounds/snd69.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND69.WAV rename to Win32/Boesounds DLL/sounds/snd69.wav diff --git a/Win32/Boesounds DLL/sounds/SND7.WAV b/Win32/Boesounds DLL/sounds/snd7.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND7.WAV rename to Win32/Boesounds DLL/sounds/snd7.wav diff --git a/Win32/Boesounds DLL/sounds/SND70.WAV b/Win32/Boesounds DLL/sounds/snd70.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND70.WAV rename to Win32/Boesounds DLL/sounds/snd70.wav diff --git a/Win32/Boesounds DLL/sounds/SND71.WAV b/Win32/Boesounds DLL/sounds/snd71.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND71.WAV rename to Win32/Boesounds DLL/sounds/snd71.wav diff --git a/Win32/Boesounds DLL/sounds/SND72.WAV b/Win32/Boesounds DLL/sounds/snd72.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND72.WAV rename to Win32/Boesounds DLL/sounds/snd72.wav diff --git a/Win32/Boesounds DLL/sounds/SND73.WAV b/Win32/Boesounds DLL/sounds/snd73.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND73.WAV rename to Win32/Boesounds DLL/sounds/snd73.wav diff --git a/Win32/Boesounds DLL/sounds/SND74.WAV b/Win32/Boesounds DLL/sounds/snd74.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND74.WAV rename to Win32/Boesounds DLL/sounds/snd74.wav diff --git a/Win32/Boesounds DLL/sounds/SND75.WAV b/Win32/Boesounds DLL/sounds/snd75.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND75.WAV rename to Win32/Boesounds DLL/sounds/snd75.wav diff --git a/Win32/Boesounds DLL/sounds/SND76.WAV b/Win32/Boesounds DLL/sounds/snd76.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND76.WAV rename to Win32/Boesounds DLL/sounds/snd76.wav diff --git a/Win32/Boesounds DLL/sounds/SND77.WAV b/Win32/Boesounds DLL/sounds/snd77.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND77.WAV rename to Win32/Boesounds DLL/sounds/snd77.wav diff --git a/Win32/Boesounds DLL/sounds/SND78.WAV b/Win32/Boesounds DLL/sounds/snd78.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND78.WAV rename to Win32/Boesounds DLL/sounds/snd78.wav diff --git a/Win32/Boesounds DLL/sounds/SND79.WAV b/Win32/Boesounds DLL/sounds/snd79.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND79.WAV rename to Win32/Boesounds DLL/sounds/snd79.wav diff --git a/Win32/Boesounds DLL/sounds/SND8.WAV b/Win32/Boesounds DLL/sounds/snd8.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND8.WAV rename to Win32/Boesounds DLL/sounds/snd8.wav diff --git a/Win32/Boesounds DLL/sounds/SND80.WAV b/Win32/Boesounds DLL/sounds/snd80.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND80.WAV rename to Win32/Boesounds DLL/sounds/snd80.wav diff --git a/Win32/Boesounds DLL/sounds/SND81.WAV b/Win32/Boesounds DLL/sounds/snd81.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND81.WAV rename to Win32/Boesounds DLL/sounds/snd81.wav diff --git a/Win32/Boesounds DLL/sounds/SND82.WAV b/Win32/Boesounds DLL/sounds/snd82.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND82.WAV rename to Win32/Boesounds DLL/sounds/snd82.wav diff --git a/Win32/Boesounds DLL/sounds/SND83.WAV b/Win32/Boesounds DLL/sounds/snd83.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND83.WAV rename to Win32/Boesounds DLL/sounds/snd83.wav diff --git a/Win32/Boesounds DLL/sounds/SND84.WAV b/Win32/Boesounds DLL/sounds/snd84.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND84.WAV rename to Win32/Boesounds DLL/sounds/snd84.wav diff --git a/Win32/Boesounds DLL/sounds/SND85.WAV b/Win32/Boesounds DLL/sounds/snd85.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND85.WAV rename to Win32/Boesounds DLL/sounds/snd85.wav diff --git a/Win32/Boesounds DLL/sounds/SND86.WAV b/Win32/Boesounds DLL/sounds/snd86.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND86.WAV rename to Win32/Boesounds DLL/sounds/snd86.wav diff --git a/Win32/Boesounds DLL/sounds/SND87.WAV b/Win32/Boesounds DLL/sounds/snd87.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND87.WAV rename to Win32/Boesounds DLL/sounds/snd87.wav diff --git a/Win32/Boesounds DLL/sounds/SND88.WAV b/Win32/Boesounds DLL/sounds/snd88.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND88.WAV rename to Win32/Boesounds DLL/sounds/snd88.wav diff --git a/Win32/Boesounds DLL/sounds/SND89.WAV b/Win32/Boesounds DLL/sounds/snd89.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND89.WAV rename to Win32/Boesounds DLL/sounds/snd89.wav diff --git a/Win32/Boesounds DLL/sounds/SND9.WAV b/Win32/Boesounds DLL/sounds/snd9.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND9.WAV rename to Win32/Boesounds DLL/sounds/snd9.wav diff --git a/Win32/Boesounds DLL/sounds/SND90.WAV b/Win32/Boesounds DLL/sounds/snd90.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND90.WAV rename to Win32/Boesounds DLL/sounds/snd90.wav diff --git a/Win32/Boesounds DLL/sounds/SND91.WAV b/Win32/Boesounds DLL/sounds/snd91.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND91.WAV rename to Win32/Boesounds DLL/sounds/snd91.wav diff --git a/Win32/Boesounds DLL/sounds/SND92.WAV b/Win32/Boesounds DLL/sounds/snd92.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND92.WAV rename to Win32/Boesounds DLL/sounds/snd92.wav diff --git a/Win32/Boesounds DLL/sounds/SND93.WAV b/Win32/Boesounds DLL/sounds/snd93.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND93.WAV rename to Win32/Boesounds DLL/sounds/snd93.wav diff --git a/Win32/Boesounds DLL/sounds/SND94.WAV b/Win32/Boesounds DLL/sounds/snd94.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND94.WAV rename to Win32/Boesounds DLL/sounds/snd94.wav diff --git a/Win32/Boesounds DLL/sounds/SND95.WAV b/Win32/Boesounds DLL/sounds/snd95.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND95.WAV rename to Win32/Boesounds DLL/sounds/snd95.wav diff --git a/Win32/Boesounds DLL/sounds/SND96.WAV b/Win32/Boesounds DLL/sounds/snd96.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND96.WAV rename to Win32/Boesounds DLL/sounds/snd96.wav diff --git a/Win32/Boesounds DLL/sounds/SND97.WAV b/Win32/Boesounds DLL/sounds/snd97.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND97.WAV rename to Win32/Boesounds DLL/sounds/snd97.wav diff --git a/Win32/Boesounds DLL/sounds/SND98.WAV b/Win32/Boesounds DLL/sounds/snd98.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND98.WAV rename to Win32/Boesounds DLL/sounds/snd98.wav diff --git a/Win32/Boesounds DLL/sounds/SND99.WAV b/Win32/Boesounds DLL/sounds/snd99.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/SND99.WAV rename to Win32/Boesounds DLL/sounds/snd99.wav diff --git a/Win32/configure b/Win32/configure new file mode 100755 index 00000000..43181688 --- /dev/null +++ b/Win32/configure @@ -0,0 +1,30 @@ +#!/usr/bin/env python +import argparse +import os +import shutil +import subprocess + +def main(): + args = parser().parse_args() + src_path = os.path.dirname(__file__) or '.' + +# shutil.copy(os.path.realpath(src_path) + '/Makefile.in', os.getcwd() + '/Makefile') + + open('.config.vars', 'w+').write( +'''PREFIX={prefix} +'''.format(**vars(args))) + + +def parser(): + parser = argparse.ArgumentParser( + prog='configure', + description='''Configure cboe automated build system. +''' + ) + parser.add_argument( + '-c', '--compiler', type=str, + help='Compiler prefix, such as i686-w64-mingw32-', dest='prefix', metavar='PREFIX', default='' + ) + return parser + +main() From a8872eb19918b268c42d1dd07c016729dc6ca593 Mon Sep 17 00:00:00 2001 From: Sylae Jiendra Corell Date: Tue, 17 Jun 2014 14:45:17 -0600 Subject: [PATCH 2/7] Rename windows directories to remove spaces. This backslash business is getting old. --- Win32/{Boesounds DLL => boesounds}/BOESOUNDS.RC | 0 Win32/{Boesounds DLL => boesounds}/Makefile | 0 Win32/{Boesounds DLL => boesounds}/boesounds.cbp | 0 Win32/{Boesounds DLL => boesounds}/boesounds.dev | 0 Win32/{Boesounds DLL => boesounds}/dllmain.cpp | 0 Win32/{Boesounds DLL => boesounds}/sounds/snd0.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd1.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd10.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd11.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd12.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd13.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd14.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd15.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd16.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd17.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd18.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd19.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd2.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd20.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd21.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd22.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd23.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd24.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd25.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd26.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd27.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd28.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd29.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd3.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd30.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd31.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd32.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd33.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd34.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd35.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd36.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd37.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd38.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd39.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd4.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd40.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd41.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd42.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd43.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd44.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd45.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd46.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd47.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd48.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd49.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd5.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd50.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd51.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd52.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd53.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd54.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd55.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd56.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd57.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd58.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd59.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd6.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd60.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd61.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd62.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd63.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd64.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd65.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd66.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd67.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd68.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd69.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd7.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd70.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd71.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd72.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd73.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd74.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd75.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd76.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd77.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd78.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd79.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd8.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd80.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd81.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd82.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd83.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd84.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd85.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd86.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd87.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd88.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd89.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd9.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd90.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd91.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd92.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd93.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd94.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd95.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd96.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd97.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd98.wav | Bin Win32/{Boesounds DLL => boesounds}/sounds/snd99.wav | Bin .../BLADPCED.RC | 0 .../Blades of Exile Char Editor.cbp | 0 .../Blades of Exile Character Editor.dev | 0 .../Blades_of_Exile_Character_Editor_private.rc | 0 .../Changes_CE.txt | 0 .../Makefile-Nightly-amd64 | 0 .../Makefile-Nightly-i586 | 0 .../Resources/BLADEXIL.ICO | Bin .../Resources/boot.cur | Bin .../Resources/c.cur | Bin .../Resources/d.cur | Bin .../Resources/dl.cur | Bin .../Resources/dr.cur | Bin .../Resources/key.cur | Bin .../Resources/l.cur | Bin .../Resources/look.cur | Bin .../Resources/r.cur | Bin .../Resources/snd0.wav | Bin .../Resources/snd1.wav | Bin .../Resources/snd3.wav | Bin .../Resources/snd34.wav | Bin .../Resources/snd37.wav | Bin .../Resources/sword.cur | Bin .../Resources/talk.cur | Bin .../Resources/target.cur | Bin .../Resources/u.cur | Bin .../Resources/ul.cur | Bin .../Resources/ur.cur | Bin .../bladpced.cpp | 0 .../dlogtool.cpp | 0 .../dlogtool.h | 0 .../edaction.cpp | 0 .../edaction.h | 0 .../edfileio.cpp | 0 .../edfileio.h | 0 .../editors.cpp | 0 .../editors.h | 0 .../edsound.cpp | 0 .../edsound.h | 0 .../global.cpp | 0 .../global.h | 0 .../graphics.cpp | 0 .../graphics.h | 0 .../graphutl.cpp | 0 .../graphutl.h | 0 Win32/{Blades of Exile => game}/BLADES.RC | 0 Win32/{Blades of Exile => game}/Blades of Exile.cbp | 0 Win32/{Blades of Exile => game}/Blades of Exile.dev | 0 .../Blades_of_Exile_private.rc | 0 Win32/{Blades of Exile => game}/Changes.txt | 0 Win32/{Blades of Exile => game}/GAMEDLOG.RC | 0 Win32/{Blades of Exile => game}/GAMESTR.RC | 0 Win32/{Blades of Exile => game}/Makefile | 0 .../Resources/BLADEXIL.ICO | Bin Win32/{Blades of Exile => game}/Resources/boot.cur | Bin Win32/{Blades of Exile => game}/Resources/c.cur | Bin Win32/{Blades of Exile => game}/Resources/d.cur | Bin Win32/{Blades of Exile => game}/Resources/dl.cur | Bin Win32/{Blades of Exile => game}/Resources/dr.cur | Bin Win32/{Blades of Exile => game}/Resources/key.cur | Bin Win32/{Blades of Exile => game}/Resources/l.cur | Bin Win32/{Blades of Exile => game}/Resources/look.cur | Bin Win32/{Blades of Exile => game}/Resources/r.cur | Bin Win32/{Blades of Exile => game}/Resources/sword.cur | Bin Win32/{Blades of Exile => game}/Resources/talk.cur | Bin .../{Blades of Exile => game}/Resources/target.cur | Bin Win32/{Blades of Exile => game}/Resources/u.cur | Bin Win32/{Blades of Exile => game}/Resources/ul.cur | Bin Win32/{Blades of Exile => game}/Resources/ur.cur | Bin Win32/{Blades of Exile => game}/boe.actions.cpp | 0 Win32/{Blades of Exile => game}/boe.actions.h | 0 Win32/{Blades of Exile => game}/boe.combat.cpp | 0 Win32/{Blades of Exile => game}/boe.combat.h | 0 Win32/{Blades of Exile => game}/boe.consts.h | 0 Win32/{Blades of Exile => game}/boe.dlgutil.cpp | 0 Win32/{Blades of Exile => game}/boe.dlgutil.h | 0 Win32/{Blades of Exile => game}/boe.fields.cpp | 0 Win32/{Blades of Exile => game}/boe.fields.h | 0 Win32/{Blades of Exile => game}/boe.fileio.cpp | 0 Win32/{Blades of Exile => game}/boe.fileio.h | 0 Win32/{Blades of Exile => game}/boe.graphics.cpp | 0 Win32/{Blades of Exile => game}/boe.graphics.h | 0 Win32/{Blades of Exile => game}/boe.graphutil.cpp | 0 Win32/{Blades of Exile => game}/boe.graphutil.h | 0 Win32/{Blades of Exile => game}/boe.infodlg.cpp | 0 Win32/{Blades of Exile => game}/boe.infodlg.h | 0 Win32/{Blades of Exile => game}/boe.itemdata.cpp | 0 Win32/{Blades of Exile => game}/boe.itemdata.h | 0 Win32/{Blades of Exile => game}/boe.items.cpp | 0 Win32/{Blades of Exile => game}/boe.items.h | 0 Win32/{Blades of Exile => game}/boe.locutils.cpp | 0 Win32/{Blades of Exile => game}/boe.locutils.h | 0 Win32/{Blades of Exile => game}/boe.main.cpp | 0 Win32/{Blades of Exile => game}/boe.main.h | 0 Win32/{Blades of Exile => game}/boe.monster.cpp | 0 Win32/{Blades of Exile => game}/boe.monster.h | 0 Win32/{Blades of Exile => game}/boe.newgraph.cpp | 0 Win32/{Blades of Exile => game}/boe.newgraph.h | 0 Win32/{Blades of Exile => game}/boe.party.cpp | 0 Win32/{Blades of Exile => game}/boe.party.h | 0 Win32/{Blades of Exile => game}/boe.specials.cpp | 0 Win32/{Blades of Exile => game}/boe.specials.h | 0 Win32/{Blades of Exile => game}/boe.text.cpp | 0 Win32/{Blades of Exile => game}/boe.text.h | 0 Win32/{Blades of Exile => game}/boe.town.cpp | 0 Win32/{Blades of Exile => game}/boe.town.h | 0 Win32/{Blades of Exile => game}/classes/consts.h | 0 Win32/{Blades of Exile => game}/classes/item.cpp | 0 Win32/{Blades of Exile => game}/classes/item.h | 0 .../{Blades of Exile => game}/classes/location.cpp | 0 Win32/{Blades of Exile => game}/classes/location.h | 0 Win32/{Blades of Exile => game}/classes/pc.cpp | 0 Win32/{Blades of Exile => game}/classes/pc.h | 0 Win32/{Blades of Exile => game}/global.cpp | 0 Win32/{Blades of Exile => game}/global.h | 0 Win32/{Blades of Exile => game}/globvar.cpp | 0 Win32/{Blades of Exile => game}/globvar.h | 0 Win32/{Blades of Exile => game}/tools/dlogtool.cpp | 0 Win32/{Blades of Exile => game}/tools/dlogtool.h | 0 Win32/{Blades of Exile => game}/tools/mathutil.cpp | 0 Win32/{Blades of Exile => game}/tools/mathutil.h | 0 Win32/{Blades of Exile => game}/tools/soundtool.cpp | 0 Win32/{Blades of Exile => game}/tools/soundtool.h | 0 Win32/{Blades of Exile => game}/tools/soundvars.cpp | 0 Win32/{Scenario Editor => scenedit}/1.cur | Bin Win32/{Scenario Editor => scenedit}/2.cur | Bin Win32/{Scenario Editor => scenedit}/3.cur | Bin Win32/{Scenario Editor => scenedit}/4.cur | Bin Win32/{Scenario Editor => scenedit}/5.cur | Bin Win32/{Scenario Editor => scenedit}/6.cur | Bin Win32/{Scenario Editor => scenedit}/7.cur | Bin Win32/{Scenario Editor => scenedit}/8.cur | Bin Win32/{Scenario Editor => scenedit}/BLSCENED.ICO | Bin Win32/{Scenario Editor => scenedit}/BLSCENED.RC | 0 .../Blades of Exile Scenario Editor.cbp | 0 .../Blades of Exile Scenario Editor.dev | 0 .../Blades_of_Exile_Scenario_Editor_private.rc | 0 Win32/{Scenario Editor => scenedit}/Changes_SE.txt | 0 Win32/{Scenario Editor => scenedit}/GAMEDLOG.RC | 0 .../Makefile-DevCpp.win | 0 .../Makefile-Nightly-amd64 | 0 .../Makefile-Nightly-i586 | 0 Win32/{Scenario Editor => scenedit}/STRINGS.RC | 0 Win32/{Scenario Editor => scenedit}/blscened.cpp | 0 Win32/{Scenario Editor => scenedit}/buttonmg.cpp | 0 Win32/{Scenario Editor => scenedit}/buttonmg.h | 0 Win32/{Scenario Editor => scenedit}/dlogtool.cpp | 0 Win32/{Scenario Editor => scenedit}/dlogtool.h | 0 Win32/{Scenario Editor => scenedit}/edsound.cpp | 0 Win32/{Scenario Editor => scenedit}/edsound.h | 0 Win32/{Scenario Editor => scenedit}/global.cpp | 0 Win32/{Scenario Editor => scenedit}/global.h | 0 Win32/{Scenario Editor => scenedit}/graphics.cpp | 0 Win32/{Scenario Editor => scenedit}/graphics.h | 0 Win32/{Scenario Editor => scenedit}/graphutl.cpp | 0 Win32/{Scenario Editor => scenedit}/graphutl.h | 0 Win32/{Scenario Editor => scenedit}/keydlgs.cpp | 0 Win32/{Scenario Editor => scenedit}/keydlgs.h | 0 Win32/{Scenario Editor => scenedit}/scenario.cpp | 0 Win32/{Scenario Editor => scenedit}/scenario.h | 0 Win32/{Scenario Editor => scenedit}/snd0.wav | Bin Win32/{Scenario Editor => scenedit}/snd1.wav | Bin Win32/{Scenario Editor => scenedit}/snd34.wav | Bin Win32/{Scenario Editor => scenedit}/snd37.wav | Bin Win32/{Scenario Editor => scenedit}/snd95.wav | Bin Win32/{Scenario Editor => scenedit}/tactions.cpp | 0 Win32/{Scenario Editor => scenedit}/tactions.h | 0 Win32/{Scenario Editor => scenedit}/tfileio.cpp | 0 Win32/{Scenario Editor => scenedit}/tfileio.h | 0 Win32/{Scenario Editor => scenedit}/townout.cpp | 0 Win32/{Scenario Editor => scenedit}/townout.h | 0 276 files changed, 0 insertions(+), 0 deletions(-) rename Win32/{Boesounds DLL => boesounds}/BOESOUNDS.RC (100%) rename Win32/{Boesounds DLL => boesounds}/Makefile (100%) rename Win32/{Boesounds DLL => boesounds}/boesounds.cbp (100%) rename Win32/{Boesounds DLL => boesounds}/boesounds.dev (100%) rename Win32/{Boesounds DLL => boesounds}/dllmain.cpp (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd0.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd1.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd10.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd11.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd12.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd13.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd14.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd15.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd16.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd17.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd18.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd19.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd2.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd20.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd21.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd22.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd23.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd24.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd25.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd26.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd27.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd28.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd29.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd3.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd30.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd31.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd32.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd33.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd34.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd35.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd36.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd37.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd38.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd39.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd4.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd40.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd41.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd42.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd43.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd44.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd45.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd46.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd47.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd48.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd49.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd5.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd50.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd51.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd52.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd53.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd54.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd55.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd56.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd57.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd58.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd59.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd6.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd60.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd61.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd62.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd63.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd64.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd65.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd66.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd67.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd68.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd69.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd7.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd70.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd71.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd72.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd73.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd74.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd75.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd76.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd77.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd78.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd79.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd8.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd80.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd81.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd82.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd83.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd84.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd85.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd86.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd87.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd88.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd89.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd9.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd90.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd91.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd92.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd93.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd94.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd95.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd96.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd97.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd98.wav (100%) rename Win32/{Boesounds DLL => boesounds}/sounds/snd99.wav (100%) rename Win32/{Blades of Exile Char Editor => charedit}/BLADPCED.RC (100%) rename Win32/{Blades of Exile Char Editor => charedit}/Blades of Exile Char Editor.cbp (100%) rename Win32/{Blades of Exile Char Editor => charedit}/Blades of Exile Character Editor.dev (100%) rename Win32/{Blades of Exile Char Editor => charedit}/Blades_of_Exile_Character_Editor_private.rc (100%) rename Win32/{Blades of Exile Char Editor => charedit}/Changes_CE.txt (100%) rename Win32/{Blades of Exile Char Editor => charedit}/Makefile-Nightly-amd64 (100%) rename Win32/{Blades of Exile Char Editor => charedit}/Makefile-Nightly-i586 (100%) rename Win32/{Blades of Exile Char Editor => charedit}/Resources/BLADEXIL.ICO (100%) rename Win32/{Blades of Exile Char Editor => charedit}/Resources/boot.cur (100%) rename Win32/{Blades of Exile Char Editor => charedit}/Resources/c.cur (100%) rename Win32/{Blades of Exile Char Editor => charedit}/Resources/d.cur (100%) rename Win32/{Blades of Exile Char Editor => charedit}/Resources/dl.cur (100%) rename Win32/{Blades of Exile Char Editor => charedit}/Resources/dr.cur (100%) rename Win32/{Blades of Exile Char Editor => charedit}/Resources/key.cur (100%) rename Win32/{Blades of Exile Char Editor => charedit}/Resources/l.cur (100%) rename Win32/{Blades of Exile Char Editor => charedit}/Resources/look.cur (100%) rename Win32/{Blades of Exile Char Editor => charedit}/Resources/r.cur (100%) rename Win32/{Blades of Exile Char Editor => charedit}/Resources/snd0.wav (100%) rename Win32/{Blades of Exile Char Editor => charedit}/Resources/snd1.wav (100%) rename Win32/{Blades of Exile Char Editor => charedit}/Resources/snd3.wav (100%) rename Win32/{Blades of Exile Char Editor => charedit}/Resources/snd34.wav (100%) rename Win32/{Blades of Exile Char Editor => charedit}/Resources/snd37.wav (100%) rename Win32/{Blades of Exile Char Editor => charedit}/Resources/sword.cur (100%) rename Win32/{Blades of Exile Char Editor => charedit}/Resources/talk.cur (100%) rename Win32/{Blades of Exile Char Editor => charedit}/Resources/target.cur (100%) rename Win32/{Blades of Exile Char Editor => charedit}/Resources/u.cur (100%) rename Win32/{Blades of Exile Char Editor => charedit}/Resources/ul.cur (100%) rename Win32/{Blades of Exile Char Editor => charedit}/Resources/ur.cur (100%) rename Win32/{Blades of Exile Char Editor => charedit}/bladpced.cpp (100%) rename Win32/{Blades of Exile Char Editor => charedit}/dlogtool.cpp (100%) rename Win32/{Blades of Exile Char Editor => charedit}/dlogtool.h (100%) rename Win32/{Blades of Exile Char Editor => charedit}/edaction.cpp (100%) rename Win32/{Blades of Exile Char Editor => charedit}/edaction.h (100%) rename Win32/{Blades of Exile Char Editor => charedit}/edfileio.cpp (100%) rename Win32/{Blades of Exile Char Editor => charedit}/edfileio.h (100%) rename Win32/{Blades of Exile Char Editor => charedit}/editors.cpp (100%) rename Win32/{Blades of Exile Char Editor => charedit}/editors.h (100%) rename Win32/{Blades of Exile Char Editor => charedit}/edsound.cpp (100%) rename Win32/{Blades of Exile Char Editor => charedit}/edsound.h (100%) rename Win32/{Blades of Exile Char Editor => charedit}/global.cpp (100%) rename Win32/{Blades of Exile Char Editor => charedit}/global.h (100%) rename Win32/{Blades of Exile Char Editor => charedit}/graphics.cpp (100%) rename Win32/{Blades of Exile Char Editor => charedit}/graphics.h (100%) rename Win32/{Blades of Exile Char Editor => charedit}/graphutl.cpp (100%) rename Win32/{Blades of Exile Char Editor => charedit}/graphutl.h (100%) rename Win32/{Blades of Exile => game}/BLADES.RC (100%) rename Win32/{Blades of Exile => game}/Blades of Exile.cbp (100%) rename Win32/{Blades of Exile => game}/Blades of Exile.dev (100%) rename Win32/{Blades of Exile => game}/Blades_of_Exile_private.rc (100%) rename Win32/{Blades of Exile => game}/Changes.txt (100%) rename Win32/{Blades of Exile => game}/GAMEDLOG.RC (100%) rename Win32/{Blades of Exile => game}/GAMESTR.RC (100%) rename Win32/{Blades of Exile => game}/Makefile (100%) rename Win32/{Blades of Exile => game}/Resources/BLADEXIL.ICO (100%) rename Win32/{Blades of Exile => game}/Resources/boot.cur (100%) rename Win32/{Blades of Exile => game}/Resources/c.cur (100%) rename Win32/{Blades of Exile => game}/Resources/d.cur (100%) rename Win32/{Blades of Exile => game}/Resources/dl.cur (100%) rename Win32/{Blades of Exile => game}/Resources/dr.cur (100%) rename Win32/{Blades of Exile => game}/Resources/key.cur (100%) rename Win32/{Blades of Exile => game}/Resources/l.cur (100%) rename Win32/{Blades of Exile => game}/Resources/look.cur (100%) rename Win32/{Blades of Exile => game}/Resources/r.cur (100%) rename Win32/{Blades of Exile => game}/Resources/sword.cur (100%) rename Win32/{Blades of Exile => game}/Resources/talk.cur (100%) rename Win32/{Blades of Exile => game}/Resources/target.cur (100%) rename Win32/{Blades of Exile => game}/Resources/u.cur (100%) rename Win32/{Blades of Exile => game}/Resources/ul.cur (100%) rename Win32/{Blades of Exile => game}/Resources/ur.cur (100%) rename Win32/{Blades of Exile => game}/boe.actions.cpp (100%) rename Win32/{Blades of Exile => game}/boe.actions.h (100%) rename Win32/{Blades of Exile => game}/boe.combat.cpp (100%) rename Win32/{Blades of Exile => game}/boe.combat.h (100%) rename Win32/{Blades of Exile => game}/boe.consts.h (100%) rename Win32/{Blades of Exile => game}/boe.dlgutil.cpp (100%) rename Win32/{Blades of Exile => game}/boe.dlgutil.h (100%) rename Win32/{Blades of Exile => game}/boe.fields.cpp (100%) rename Win32/{Blades of Exile => game}/boe.fields.h (100%) rename Win32/{Blades of Exile => game}/boe.fileio.cpp (100%) rename Win32/{Blades of Exile => game}/boe.fileio.h (100%) rename Win32/{Blades of Exile => game}/boe.graphics.cpp (100%) rename Win32/{Blades of Exile => game}/boe.graphics.h (100%) rename Win32/{Blades of Exile => game}/boe.graphutil.cpp (100%) rename Win32/{Blades of Exile => game}/boe.graphutil.h (100%) rename Win32/{Blades of Exile => game}/boe.infodlg.cpp (100%) rename Win32/{Blades of Exile => game}/boe.infodlg.h (100%) rename Win32/{Blades of Exile => game}/boe.itemdata.cpp (100%) rename Win32/{Blades of Exile => game}/boe.itemdata.h (100%) rename Win32/{Blades of Exile => game}/boe.items.cpp (100%) rename Win32/{Blades of Exile => game}/boe.items.h (100%) rename Win32/{Blades of Exile => game}/boe.locutils.cpp (100%) rename Win32/{Blades of Exile => game}/boe.locutils.h (100%) rename Win32/{Blades of Exile => game}/boe.main.cpp (100%) rename Win32/{Blades of Exile => game}/boe.main.h (100%) rename Win32/{Blades of Exile => game}/boe.monster.cpp (100%) rename Win32/{Blades of Exile => game}/boe.monster.h (100%) rename Win32/{Blades of Exile => game}/boe.newgraph.cpp (100%) rename Win32/{Blades of Exile => game}/boe.newgraph.h (100%) rename Win32/{Blades of Exile => game}/boe.party.cpp (100%) rename Win32/{Blades of Exile => game}/boe.party.h (100%) rename Win32/{Blades of Exile => game}/boe.specials.cpp (100%) rename Win32/{Blades of Exile => game}/boe.specials.h (100%) rename Win32/{Blades of Exile => game}/boe.text.cpp (100%) rename Win32/{Blades of Exile => game}/boe.text.h (100%) rename Win32/{Blades of Exile => game}/boe.town.cpp (100%) rename Win32/{Blades of Exile => game}/boe.town.h (100%) rename Win32/{Blades of Exile => game}/classes/consts.h (100%) rename Win32/{Blades of Exile => game}/classes/item.cpp (100%) rename Win32/{Blades of Exile => game}/classes/item.h (100%) rename Win32/{Blades of Exile => game}/classes/location.cpp (100%) rename Win32/{Blades of Exile => game}/classes/location.h (100%) rename Win32/{Blades of Exile => game}/classes/pc.cpp (100%) rename Win32/{Blades of Exile => game}/classes/pc.h (100%) rename Win32/{Blades of Exile => game}/global.cpp (100%) rename Win32/{Blades of Exile => game}/global.h (100%) rename Win32/{Blades of Exile => game}/globvar.cpp (100%) rename Win32/{Blades of Exile => game}/globvar.h (100%) rename Win32/{Blades of Exile => game}/tools/dlogtool.cpp (100%) rename Win32/{Blades of Exile => game}/tools/dlogtool.h (100%) rename Win32/{Blades of Exile => game}/tools/mathutil.cpp (100%) rename Win32/{Blades of Exile => game}/tools/mathutil.h (100%) rename Win32/{Blades of Exile => game}/tools/soundtool.cpp (100%) rename Win32/{Blades of Exile => game}/tools/soundtool.h (100%) rename Win32/{Blades of Exile => game}/tools/soundvars.cpp (100%) rename Win32/{Scenario Editor => scenedit}/1.cur (100%) rename Win32/{Scenario Editor => scenedit}/2.cur (100%) rename Win32/{Scenario Editor => scenedit}/3.cur (100%) rename Win32/{Scenario Editor => scenedit}/4.cur (100%) rename Win32/{Scenario Editor => scenedit}/5.cur (100%) rename Win32/{Scenario Editor => scenedit}/6.cur (100%) rename Win32/{Scenario Editor => scenedit}/7.cur (100%) rename Win32/{Scenario Editor => scenedit}/8.cur (100%) rename Win32/{Scenario Editor => scenedit}/BLSCENED.ICO (100%) rename Win32/{Scenario Editor => scenedit}/BLSCENED.RC (100%) rename Win32/{Scenario Editor => scenedit}/Blades of Exile Scenario Editor.cbp (100%) rename Win32/{Scenario Editor => scenedit}/Blades of Exile Scenario Editor.dev (100%) rename Win32/{Scenario Editor => scenedit}/Blades_of_Exile_Scenario_Editor_private.rc (100%) rename Win32/{Scenario Editor => scenedit}/Changes_SE.txt (100%) rename Win32/{Scenario Editor => scenedit}/GAMEDLOG.RC (100%) rename Win32/{Scenario Editor => scenedit}/Makefile-DevCpp.win (100%) rename Win32/{Scenario Editor => scenedit}/Makefile-Nightly-amd64 (100%) rename Win32/{Scenario Editor => scenedit}/Makefile-Nightly-i586 (100%) rename Win32/{Scenario Editor => scenedit}/STRINGS.RC (100%) rename Win32/{Scenario Editor => scenedit}/blscened.cpp (100%) rename Win32/{Scenario Editor => scenedit}/buttonmg.cpp (100%) rename Win32/{Scenario Editor => scenedit}/buttonmg.h (100%) rename Win32/{Scenario Editor => scenedit}/dlogtool.cpp (100%) rename Win32/{Scenario Editor => scenedit}/dlogtool.h (100%) rename Win32/{Scenario Editor => scenedit}/edsound.cpp (100%) rename Win32/{Scenario Editor => scenedit}/edsound.h (100%) rename Win32/{Scenario Editor => scenedit}/global.cpp (100%) rename Win32/{Scenario Editor => scenedit}/global.h (100%) rename Win32/{Scenario Editor => scenedit}/graphics.cpp (100%) rename Win32/{Scenario Editor => scenedit}/graphics.h (100%) rename Win32/{Scenario Editor => scenedit}/graphutl.cpp (100%) rename Win32/{Scenario Editor => scenedit}/graphutl.h (100%) rename Win32/{Scenario Editor => scenedit}/keydlgs.cpp (100%) rename Win32/{Scenario Editor => scenedit}/keydlgs.h (100%) rename Win32/{Scenario Editor => scenedit}/scenario.cpp (100%) rename Win32/{Scenario Editor => scenedit}/scenario.h (100%) rename Win32/{Scenario Editor => scenedit}/snd0.wav (100%) rename Win32/{Scenario Editor => scenedit}/snd1.wav (100%) rename Win32/{Scenario Editor => scenedit}/snd34.wav (100%) rename Win32/{Scenario Editor => scenedit}/snd37.wav (100%) rename Win32/{Scenario Editor => scenedit}/snd95.wav (100%) rename Win32/{Scenario Editor => scenedit}/tactions.cpp (100%) rename Win32/{Scenario Editor => scenedit}/tactions.h (100%) rename Win32/{Scenario Editor => scenedit}/tfileio.cpp (100%) rename Win32/{Scenario Editor => scenedit}/tfileio.h (100%) rename Win32/{Scenario Editor => scenedit}/townout.cpp (100%) rename Win32/{Scenario Editor => scenedit}/townout.h (100%) diff --git a/Win32/Boesounds DLL/BOESOUNDS.RC b/Win32/boesounds/BOESOUNDS.RC similarity index 100% rename from Win32/Boesounds DLL/BOESOUNDS.RC rename to Win32/boesounds/BOESOUNDS.RC diff --git a/Win32/Boesounds DLL/Makefile b/Win32/boesounds/Makefile similarity index 100% rename from Win32/Boesounds DLL/Makefile rename to Win32/boesounds/Makefile diff --git a/Win32/Boesounds DLL/boesounds.cbp b/Win32/boesounds/boesounds.cbp similarity index 100% rename from Win32/Boesounds DLL/boesounds.cbp rename to Win32/boesounds/boesounds.cbp diff --git a/Win32/Boesounds DLL/boesounds.dev b/Win32/boesounds/boesounds.dev similarity index 100% rename from Win32/Boesounds DLL/boesounds.dev rename to Win32/boesounds/boesounds.dev diff --git a/Win32/Boesounds DLL/dllmain.cpp b/Win32/boesounds/dllmain.cpp similarity index 100% rename from Win32/Boesounds DLL/dllmain.cpp rename to Win32/boesounds/dllmain.cpp diff --git a/Win32/Boesounds DLL/sounds/snd0.wav b/Win32/boesounds/sounds/snd0.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd0.wav rename to Win32/boesounds/sounds/snd0.wav diff --git a/Win32/Boesounds DLL/sounds/snd1.wav b/Win32/boesounds/sounds/snd1.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd1.wav rename to Win32/boesounds/sounds/snd1.wav diff --git a/Win32/Boesounds DLL/sounds/snd10.wav b/Win32/boesounds/sounds/snd10.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd10.wav rename to Win32/boesounds/sounds/snd10.wav diff --git a/Win32/Boesounds DLL/sounds/snd11.wav b/Win32/boesounds/sounds/snd11.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd11.wav rename to Win32/boesounds/sounds/snd11.wav diff --git a/Win32/Boesounds DLL/sounds/snd12.wav b/Win32/boesounds/sounds/snd12.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd12.wav rename to Win32/boesounds/sounds/snd12.wav diff --git a/Win32/Boesounds DLL/sounds/snd13.wav b/Win32/boesounds/sounds/snd13.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd13.wav rename to Win32/boesounds/sounds/snd13.wav diff --git a/Win32/Boesounds DLL/sounds/snd14.wav b/Win32/boesounds/sounds/snd14.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd14.wav rename to Win32/boesounds/sounds/snd14.wav diff --git a/Win32/Boesounds DLL/sounds/snd15.wav b/Win32/boesounds/sounds/snd15.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd15.wav rename to Win32/boesounds/sounds/snd15.wav diff --git a/Win32/Boesounds DLL/sounds/snd16.wav b/Win32/boesounds/sounds/snd16.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd16.wav rename to Win32/boesounds/sounds/snd16.wav diff --git a/Win32/Boesounds DLL/sounds/snd17.wav b/Win32/boesounds/sounds/snd17.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd17.wav rename to Win32/boesounds/sounds/snd17.wav diff --git a/Win32/Boesounds DLL/sounds/snd18.wav b/Win32/boesounds/sounds/snd18.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd18.wav rename to Win32/boesounds/sounds/snd18.wav diff --git a/Win32/Boesounds DLL/sounds/snd19.wav b/Win32/boesounds/sounds/snd19.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd19.wav rename to Win32/boesounds/sounds/snd19.wav diff --git a/Win32/Boesounds DLL/sounds/snd2.wav b/Win32/boesounds/sounds/snd2.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd2.wav rename to Win32/boesounds/sounds/snd2.wav diff --git a/Win32/Boesounds DLL/sounds/snd20.wav b/Win32/boesounds/sounds/snd20.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd20.wav rename to Win32/boesounds/sounds/snd20.wav diff --git a/Win32/Boesounds DLL/sounds/snd21.wav b/Win32/boesounds/sounds/snd21.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd21.wav rename to Win32/boesounds/sounds/snd21.wav diff --git a/Win32/Boesounds DLL/sounds/snd22.wav b/Win32/boesounds/sounds/snd22.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd22.wav rename to Win32/boesounds/sounds/snd22.wav diff --git a/Win32/Boesounds DLL/sounds/snd23.wav b/Win32/boesounds/sounds/snd23.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd23.wav rename to Win32/boesounds/sounds/snd23.wav diff --git a/Win32/Boesounds DLL/sounds/snd24.wav b/Win32/boesounds/sounds/snd24.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd24.wav rename to Win32/boesounds/sounds/snd24.wav diff --git a/Win32/Boesounds DLL/sounds/snd25.wav b/Win32/boesounds/sounds/snd25.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd25.wav rename to Win32/boesounds/sounds/snd25.wav diff --git a/Win32/Boesounds DLL/sounds/snd26.wav b/Win32/boesounds/sounds/snd26.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd26.wav rename to Win32/boesounds/sounds/snd26.wav diff --git a/Win32/Boesounds DLL/sounds/snd27.wav b/Win32/boesounds/sounds/snd27.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd27.wav rename to Win32/boesounds/sounds/snd27.wav diff --git a/Win32/Boesounds DLL/sounds/snd28.wav b/Win32/boesounds/sounds/snd28.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd28.wav rename to Win32/boesounds/sounds/snd28.wav diff --git a/Win32/Boesounds DLL/sounds/snd29.wav b/Win32/boesounds/sounds/snd29.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd29.wav rename to Win32/boesounds/sounds/snd29.wav diff --git a/Win32/Boesounds DLL/sounds/snd3.wav b/Win32/boesounds/sounds/snd3.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd3.wav rename to Win32/boesounds/sounds/snd3.wav diff --git a/Win32/Boesounds DLL/sounds/snd30.wav b/Win32/boesounds/sounds/snd30.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd30.wav rename to Win32/boesounds/sounds/snd30.wav diff --git a/Win32/Boesounds DLL/sounds/snd31.wav b/Win32/boesounds/sounds/snd31.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd31.wav rename to Win32/boesounds/sounds/snd31.wav diff --git a/Win32/Boesounds DLL/sounds/snd32.wav b/Win32/boesounds/sounds/snd32.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd32.wav rename to Win32/boesounds/sounds/snd32.wav diff --git a/Win32/Boesounds DLL/sounds/snd33.wav b/Win32/boesounds/sounds/snd33.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd33.wav rename to Win32/boesounds/sounds/snd33.wav diff --git a/Win32/Boesounds DLL/sounds/snd34.wav b/Win32/boesounds/sounds/snd34.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd34.wav rename to Win32/boesounds/sounds/snd34.wav diff --git a/Win32/Boesounds DLL/sounds/snd35.wav b/Win32/boesounds/sounds/snd35.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd35.wav rename to Win32/boesounds/sounds/snd35.wav diff --git a/Win32/Boesounds DLL/sounds/snd36.wav b/Win32/boesounds/sounds/snd36.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd36.wav rename to Win32/boesounds/sounds/snd36.wav diff --git a/Win32/Boesounds DLL/sounds/snd37.wav b/Win32/boesounds/sounds/snd37.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd37.wav rename to Win32/boesounds/sounds/snd37.wav diff --git a/Win32/Boesounds DLL/sounds/snd38.wav b/Win32/boesounds/sounds/snd38.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd38.wav rename to Win32/boesounds/sounds/snd38.wav diff --git a/Win32/Boesounds DLL/sounds/snd39.wav b/Win32/boesounds/sounds/snd39.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd39.wav rename to Win32/boesounds/sounds/snd39.wav diff --git a/Win32/Boesounds DLL/sounds/snd4.wav b/Win32/boesounds/sounds/snd4.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd4.wav rename to Win32/boesounds/sounds/snd4.wav diff --git a/Win32/Boesounds DLL/sounds/snd40.wav b/Win32/boesounds/sounds/snd40.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd40.wav rename to Win32/boesounds/sounds/snd40.wav diff --git a/Win32/Boesounds DLL/sounds/snd41.wav b/Win32/boesounds/sounds/snd41.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd41.wav rename to Win32/boesounds/sounds/snd41.wav diff --git a/Win32/Boesounds DLL/sounds/snd42.wav b/Win32/boesounds/sounds/snd42.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd42.wav rename to Win32/boesounds/sounds/snd42.wav diff --git a/Win32/Boesounds DLL/sounds/snd43.wav b/Win32/boesounds/sounds/snd43.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd43.wav rename to Win32/boesounds/sounds/snd43.wav diff --git a/Win32/Boesounds DLL/sounds/snd44.wav b/Win32/boesounds/sounds/snd44.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd44.wav rename to Win32/boesounds/sounds/snd44.wav diff --git a/Win32/Boesounds DLL/sounds/snd45.wav b/Win32/boesounds/sounds/snd45.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd45.wav rename to Win32/boesounds/sounds/snd45.wav diff --git a/Win32/Boesounds DLL/sounds/snd46.wav b/Win32/boesounds/sounds/snd46.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd46.wav rename to Win32/boesounds/sounds/snd46.wav diff --git a/Win32/Boesounds DLL/sounds/snd47.wav b/Win32/boesounds/sounds/snd47.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd47.wav rename to Win32/boesounds/sounds/snd47.wav diff --git a/Win32/Boesounds DLL/sounds/snd48.wav b/Win32/boesounds/sounds/snd48.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd48.wav rename to Win32/boesounds/sounds/snd48.wav diff --git a/Win32/Boesounds DLL/sounds/snd49.wav b/Win32/boesounds/sounds/snd49.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd49.wav rename to Win32/boesounds/sounds/snd49.wav diff --git a/Win32/Boesounds DLL/sounds/snd5.wav b/Win32/boesounds/sounds/snd5.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd5.wav rename to Win32/boesounds/sounds/snd5.wav diff --git a/Win32/Boesounds DLL/sounds/snd50.wav b/Win32/boesounds/sounds/snd50.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd50.wav rename to Win32/boesounds/sounds/snd50.wav diff --git a/Win32/Boesounds DLL/sounds/snd51.wav b/Win32/boesounds/sounds/snd51.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd51.wav rename to Win32/boesounds/sounds/snd51.wav diff --git a/Win32/Boesounds DLL/sounds/snd52.wav b/Win32/boesounds/sounds/snd52.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd52.wav rename to Win32/boesounds/sounds/snd52.wav diff --git a/Win32/Boesounds DLL/sounds/snd53.wav b/Win32/boesounds/sounds/snd53.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd53.wav rename to Win32/boesounds/sounds/snd53.wav diff --git a/Win32/Boesounds DLL/sounds/snd54.wav b/Win32/boesounds/sounds/snd54.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd54.wav rename to Win32/boesounds/sounds/snd54.wav diff --git a/Win32/Boesounds DLL/sounds/snd55.wav b/Win32/boesounds/sounds/snd55.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd55.wav rename to Win32/boesounds/sounds/snd55.wav diff --git a/Win32/Boesounds DLL/sounds/snd56.wav b/Win32/boesounds/sounds/snd56.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd56.wav rename to Win32/boesounds/sounds/snd56.wav diff --git a/Win32/Boesounds DLL/sounds/snd57.wav b/Win32/boesounds/sounds/snd57.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd57.wav rename to Win32/boesounds/sounds/snd57.wav diff --git a/Win32/Boesounds DLL/sounds/snd58.wav b/Win32/boesounds/sounds/snd58.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd58.wav rename to Win32/boesounds/sounds/snd58.wav diff --git a/Win32/Boesounds DLL/sounds/snd59.wav b/Win32/boesounds/sounds/snd59.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd59.wav rename to Win32/boesounds/sounds/snd59.wav diff --git a/Win32/Boesounds DLL/sounds/snd6.wav b/Win32/boesounds/sounds/snd6.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd6.wav rename to Win32/boesounds/sounds/snd6.wav diff --git a/Win32/Boesounds DLL/sounds/snd60.wav b/Win32/boesounds/sounds/snd60.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd60.wav rename to Win32/boesounds/sounds/snd60.wav diff --git a/Win32/Boesounds DLL/sounds/snd61.wav b/Win32/boesounds/sounds/snd61.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd61.wav rename to Win32/boesounds/sounds/snd61.wav diff --git a/Win32/Boesounds DLL/sounds/snd62.wav b/Win32/boesounds/sounds/snd62.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd62.wav rename to Win32/boesounds/sounds/snd62.wav diff --git a/Win32/Boesounds DLL/sounds/snd63.wav b/Win32/boesounds/sounds/snd63.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd63.wav rename to Win32/boesounds/sounds/snd63.wav diff --git a/Win32/Boesounds DLL/sounds/snd64.wav b/Win32/boesounds/sounds/snd64.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd64.wav rename to Win32/boesounds/sounds/snd64.wav diff --git a/Win32/Boesounds DLL/sounds/snd65.wav b/Win32/boesounds/sounds/snd65.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd65.wav rename to Win32/boesounds/sounds/snd65.wav diff --git a/Win32/Boesounds DLL/sounds/snd66.wav b/Win32/boesounds/sounds/snd66.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd66.wav rename to Win32/boesounds/sounds/snd66.wav diff --git a/Win32/Boesounds DLL/sounds/snd67.wav b/Win32/boesounds/sounds/snd67.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd67.wav rename to Win32/boesounds/sounds/snd67.wav diff --git a/Win32/Boesounds DLL/sounds/snd68.wav b/Win32/boesounds/sounds/snd68.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd68.wav rename to Win32/boesounds/sounds/snd68.wav diff --git a/Win32/Boesounds DLL/sounds/snd69.wav b/Win32/boesounds/sounds/snd69.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd69.wav rename to Win32/boesounds/sounds/snd69.wav diff --git a/Win32/Boesounds DLL/sounds/snd7.wav b/Win32/boesounds/sounds/snd7.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd7.wav rename to Win32/boesounds/sounds/snd7.wav diff --git a/Win32/Boesounds DLL/sounds/snd70.wav b/Win32/boesounds/sounds/snd70.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd70.wav rename to Win32/boesounds/sounds/snd70.wav diff --git a/Win32/Boesounds DLL/sounds/snd71.wav b/Win32/boesounds/sounds/snd71.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd71.wav rename to Win32/boesounds/sounds/snd71.wav diff --git a/Win32/Boesounds DLL/sounds/snd72.wav b/Win32/boesounds/sounds/snd72.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd72.wav rename to Win32/boesounds/sounds/snd72.wav diff --git a/Win32/Boesounds DLL/sounds/snd73.wav b/Win32/boesounds/sounds/snd73.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd73.wav rename to Win32/boesounds/sounds/snd73.wav diff --git a/Win32/Boesounds DLL/sounds/snd74.wav b/Win32/boesounds/sounds/snd74.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd74.wav rename to Win32/boesounds/sounds/snd74.wav diff --git a/Win32/Boesounds DLL/sounds/snd75.wav b/Win32/boesounds/sounds/snd75.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd75.wav rename to Win32/boesounds/sounds/snd75.wav diff --git a/Win32/Boesounds DLL/sounds/snd76.wav b/Win32/boesounds/sounds/snd76.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd76.wav rename to Win32/boesounds/sounds/snd76.wav diff --git a/Win32/Boesounds DLL/sounds/snd77.wav b/Win32/boesounds/sounds/snd77.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd77.wav rename to Win32/boesounds/sounds/snd77.wav diff --git a/Win32/Boesounds DLL/sounds/snd78.wav b/Win32/boesounds/sounds/snd78.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd78.wav rename to Win32/boesounds/sounds/snd78.wav diff --git a/Win32/Boesounds DLL/sounds/snd79.wav b/Win32/boesounds/sounds/snd79.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd79.wav rename to Win32/boesounds/sounds/snd79.wav diff --git a/Win32/Boesounds DLL/sounds/snd8.wav b/Win32/boesounds/sounds/snd8.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd8.wav rename to Win32/boesounds/sounds/snd8.wav diff --git a/Win32/Boesounds DLL/sounds/snd80.wav b/Win32/boesounds/sounds/snd80.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd80.wav rename to Win32/boesounds/sounds/snd80.wav diff --git a/Win32/Boesounds DLL/sounds/snd81.wav b/Win32/boesounds/sounds/snd81.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd81.wav rename to Win32/boesounds/sounds/snd81.wav diff --git a/Win32/Boesounds DLL/sounds/snd82.wav b/Win32/boesounds/sounds/snd82.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd82.wav rename to Win32/boesounds/sounds/snd82.wav diff --git a/Win32/Boesounds DLL/sounds/snd83.wav b/Win32/boesounds/sounds/snd83.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd83.wav rename to Win32/boesounds/sounds/snd83.wav diff --git a/Win32/Boesounds DLL/sounds/snd84.wav b/Win32/boesounds/sounds/snd84.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd84.wav rename to Win32/boesounds/sounds/snd84.wav diff --git a/Win32/Boesounds DLL/sounds/snd85.wav b/Win32/boesounds/sounds/snd85.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd85.wav rename to Win32/boesounds/sounds/snd85.wav diff --git a/Win32/Boesounds DLL/sounds/snd86.wav b/Win32/boesounds/sounds/snd86.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd86.wav rename to Win32/boesounds/sounds/snd86.wav diff --git a/Win32/Boesounds DLL/sounds/snd87.wav b/Win32/boesounds/sounds/snd87.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd87.wav rename to Win32/boesounds/sounds/snd87.wav diff --git a/Win32/Boesounds DLL/sounds/snd88.wav b/Win32/boesounds/sounds/snd88.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd88.wav rename to Win32/boesounds/sounds/snd88.wav diff --git a/Win32/Boesounds DLL/sounds/snd89.wav b/Win32/boesounds/sounds/snd89.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd89.wav rename to Win32/boesounds/sounds/snd89.wav diff --git a/Win32/Boesounds DLL/sounds/snd9.wav b/Win32/boesounds/sounds/snd9.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd9.wav rename to Win32/boesounds/sounds/snd9.wav diff --git a/Win32/Boesounds DLL/sounds/snd90.wav b/Win32/boesounds/sounds/snd90.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd90.wav rename to Win32/boesounds/sounds/snd90.wav diff --git a/Win32/Boesounds DLL/sounds/snd91.wav b/Win32/boesounds/sounds/snd91.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd91.wav rename to Win32/boesounds/sounds/snd91.wav diff --git a/Win32/Boesounds DLL/sounds/snd92.wav b/Win32/boesounds/sounds/snd92.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd92.wav rename to Win32/boesounds/sounds/snd92.wav diff --git a/Win32/Boesounds DLL/sounds/snd93.wav b/Win32/boesounds/sounds/snd93.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd93.wav rename to Win32/boesounds/sounds/snd93.wav diff --git a/Win32/Boesounds DLL/sounds/snd94.wav b/Win32/boesounds/sounds/snd94.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd94.wav rename to Win32/boesounds/sounds/snd94.wav diff --git a/Win32/Boesounds DLL/sounds/snd95.wav b/Win32/boesounds/sounds/snd95.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd95.wav rename to Win32/boesounds/sounds/snd95.wav diff --git a/Win32/Boesounds DLL/sounds/snd96.wav b/Win32/boesounds/sounds/snd96.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd96.wav rename to Win32/boesounds/sounds/snd96.wav diff --git a/Win32/Boesounds DLL/sounds/snd97.wav b/Win32/boesounds/sounds/snd97.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd97.wav rename to Win32/boesounds/sounds/snd97.wav diff --git a/Win32/Boesounds DLL/sounds/snd98.wav b/Win32/boesounds/sounds/snd98.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd98.wav rename to Win32/boesounds/sounds/snd98.wav diff --git a/Win32/Boesounds DLL/sounds/snd99.wav b/Win32/boesounds/sounds/snd99.wav similarity index 100% rename from Win32/Boesounds DLL/sounds/snd99.wav rename to Win32/boesounds/sounds/snd99.wav diff --git a/Win32/Blades of Exile Char Editor/BLADPCED.RC b/Win32/charedit/BLADPCED.RC similarity index 100% rename from Win32/Blades of Exile Char Editor/BLADPCED.RC rename to Win32/charedit/BLADPCED.RC diff --git a/Win32/Blades of Exile Char Editor/Blades of Exile Char Editor.cbp b/Win32/charedit/Blades of Exile Char Editor.cbp similarity index 100% rename from Win32/Blades of Exile Char Editor/Blades of Exile Char Editor.cbp rename to Win32/charedit/Blades of Exile Char Editor.cbp diff --git a/Win32/Blades of Exile Char Editor/Blades of Exile Character Editor.dev b/Win32/charedit/Blades of Exile Character Editor.dev similarity index 100% rename from Win32/Blades of Exile Char Editor/Blades of Exile Character Editor.dev rename to Win32/charedit/Blades of Exile Character Editor.dev diff --git a/Win32/Blades of Exile Char Editor/Blades_of_Exile_Character_Editor_private.rc b/Win32/charedit/Blades_of_Exile_Character_Editor_private.rc similarity index 100% rename from Win32/Blades of Exile Char Editor/Blades_of_Exile_Character_Editor_private.rc rename to Win32/charedit/Blades_of_Exile_Character_Editor_private.rc diff --git a/Win32/Blades of Exile Char Editor/Changes_CE.txt b/Win32/charedit/Changes_CE.txt similarity index 100% rename from Win32/Blades of Exile Char Editor/Changes_CE.txt rename to Win32/charedit/Changes_CE.txt diff --git a/Win32/Blades of Exile Char Editor/Makefile-Nightly-amd64 b/Win32/charedit/Makefile-Nightly-amd64 similarity index 100% rename from Win32/Blades of Exile Char Editor/Makefile-Nightly-amd64 rename to Win32/charedit/Makefile-Nightly-amd64 diff --git a/Win32/Blades of Exile Char Editor/Makefile-Nightly-i586 b/Win32/charedit/Makefile-Nightly-i586 similarity index 100% rename from Win32/Blades of Exile Char Editor/Makefile-Nightly-i586 rename to Win32/charedit/Makefile-Nightly-i586 diff --git a/Win32/Blades of Exile Char Editor/Resources/BLADEXIL.ICO b/Win32/charedit/Resources/BLADEXIL.ICO similarity index 100% rename from Win32/Blades of Exile Char Editor/Resources/BLADEXIL.ICO rename to Win32/charedit/Resources/BLADEXIL.ICO diff --git a/Win32/Blades of Exile Char Editor/Resources/boot.cur b/Win32/charedit/Resources/boot.cur similarity index 100% rename from Win32/Blades of Exile Char Editor/Resources/boot.cur rename to Win32/charedit/Resources/boot.cur diff --git a/Win32/Blades of Exile Char Editor/Resources/c.cur b/Win32/charedit/Resources/c.cur similarity index 100% rename from Win32/Blades of Exile Char Editor/Resources/c.cur rename to Win32/charedit/Resources/c.cur diff --git a/Win32/Blades of Exile Char Editor/Resources/d.cur b/Win32/charedit/Resources/d.cur similarity index 100% rename from Win32/Blades of Exile Char Editor/Resources/d.cur rename to Win32/charedit/Resources/d.cur diff --git a/Win32/Blades of Exile Char Editor/Resources/dl.cur b/Win32/charedit/Resources/dl.cur similarity index 100% rename from Win32/Blades of Exile Char Editor/Resources/dl.cur rename to Win32/charedit/Resources/dl.cur diff --git a/Win32/Blades of Exile Char Editor/Resources/dr.cur b/Win32/charedit/Resources/dr.cur similarity index 100% rename from Win32/Blades of Exile Char Editor/Resources/dr.cur rename to Win32/charedit/Resources/dr.cur diff --git a/Win32/Blades of Exile Char Editor/Resources/key.cur b/Win32/charedit/Resources/key.cur similarity index 100% rename from Win32/Blades of Exile Char Editor/Resources/key.cur rename to Win32/charedit/Resources/key.cur diff --git a/Win32/Blades of Exile Char Editor/Resources/l.cur b/Win32/charedit/Resources/l.cur similarity index 100% rename from Win32/Blades of Exile Char Editor/Resources/l.cur rename to Win32/charedit/Resources/l.cur diff --git a/Win32/Blades of Exile Char Editor/Resources/look.cur b/Win32/charedit/Resources/look.cur similarity index 100% rename from Win32/Blades of Exile Char Editor/Resources/look.cur rename to Win32/charedit/Resources/look.cur diff --git a/Win32/Blades of Exile Char Editor/Resources/r.cur b/Win32/charedit/Resources/r.cur similarity index 100% rename from Win32/Blades of Exile Char Editor/Resources/r.cur rename to Win32/charedit/Resources/r.cur diff --git a/Win32/Blades of Exile Char Editor/Resources/snd0.wav b/Win32/charedit/Resources/snd0.wav similarity index 100% rename from Win32/Blades of Exile Char Editor/Resources/snd0.wav rename to Win32/charedit/Resources/snd0.wav diff --git a/Win32/Blades of Exile Char Editor/Resources/snd1.wav b/Win32/charedit/Resources/snd1.wav similarity index 100% rename from Win32/Blades of Exile Char Editor/Resources/snd1.wav rename to Win32/charedit/Resources/snd1.wav diff --git a/Win32/Blades of Exile Char Editor/Resources/snd3.wav b/Win32/charedit/Resources/snd3.wav similarity index 100% rename from Win32/Blades of Exile Char Editor/Resources/snd3.wav rename to Win32/charedit/Resources/snd3.wav diff --git a/Win32/Blades of Exile Char Editor/Resources/snd34.wav b/Win32/charedit/Resources/snd34.wav similarity index 100% rename from Win32/Blades of Exile Char Editor/Resources/snd34.wav rename to Win32/charedit/Resources/snd34.wav diff --git a/Win32/Blades of Exile Char Editor/Resources/snd37.wav b/Win32/charedit/Resources/snd37.wav similarity index 100% rename from Win32/Blades of Exile Char Editor/Resources/snd37.wav rename to Win32/charedit/Resources/snd37.wav diff --git a/Win32/Blades of Exile Char Editor/Resources/sword.cur b/Win32/charedit/Resources/sword.cur similarity index 100% rename from Win32/Blades of Exile Char Editor/Resources/sword.cur rename to Win32/charedit/Resources/sword.cur diff --git a/Win32/Blades of Exile Char Editor/Resources/talk.cur b/Win32/charedit/Resources/talk.cur similarity index 100% rename from Win32/Blades of Exile Char Editor/Resources/talk.cur rename to Win32/charedit/Resources/talk.cur diff --git a/Win32/Blades of Exile Char Editor/Resources/target.cur b/Win32/charedit/Resources/target.cur similarity index 100% rename from Win32/Blades of Exile Char Editor/Resources/target.cur rename to Win32/charedit/Resources/target.cur diff --git a/Win32/Blades of Exile Char Editor/Resources/u.cur b/Win32/charedit/Resources/u.cur similarity index 100% rename from Win32/Blades of Exile Char Editor/Resources/u.cur rename to Win32/charedit/Resources/u.cur diff --git a/Win32/Blades of Exile Char Editor/Resources/ul.cur b/Win32/charedit/Resources/ul.cur similarity index 100% rename from Win32/Blades of Exile Char Editor/Resources/ul.cur rename to Win32/charedit/Resources/ul.cur diff --git a/Win32/Blades of Exile Char Editor/Resources/ur.cur b/Win32/charedit/Resources/ur.cur similarity index 100% rename from Win32/Blades of Exile Char Editor/Resources/ur.cur rename to Win32/charedit/Resources/ur.cur diff --git a/Win32/Blades of Exile Char Editor/bladpced.cpp b/Win32/charedit/bladpced.cpp similarity index 100% rename from Win32/Blades of Exile Char Editor/bladpced.cpp rename to Win32/charedit/bladpced.cpp diff --git a/Win32/Blades of Exile Char Editor/dlogtool.cpp b/Win32/charedit/dlogtool.cpp similarity index 100% rename from Win32/Blades of Exile Char Editor/dlogtool.cpp rename to Win32/charedit/dlogtool.cpp diff --git a/Win32/Blades of Exile Char Editor/dlogtool.h b/Win32/charedit/dlogtool.h similarity index 100% rename from Win32/Blades of Exile Char Editor/dlogtool.h rename to Win32/charedit/dlogtool.h diff --git a/Win32/Blades of Exile Char Editor/edaction.cpp b/Win32/charedit/edaction.cpp similarity index 100% rename from Win32/Blades of Exile Char Editor/edaction.cpp rename to Win32/charedit/edaction.cpp diff --git a/Win32/Blades of Exile Char Editor/edaction.h b/Win32/charedit/edaction.h similarity index 100% rename from Win32/Blades of Exile Char Editor/edaction.h rename to Win32/charedit/edaction.h diff --git a/Win32/Blades of Exile Char Editor/edfileio.cpp b/Win32/charedit/edfileio.cpp similarity index 100% rename from Win32/Blades of Exile Char Editor/edfileio.cpp rename to Win32/charedit/edfileio.cpp diff --git a/Win32/Blades of Exile Char Editor/edfileio.h b/Win32/charedit/edfileio.h similarity index 100% rename from Win32/Blades of Exile Char Editor/edfileio.h rename to Win32/charedit/edfileio.h diff --git a/Win32/Blades of Exile Char Editor/editors.cpp b/Win32/charedit/editors.cpp similarity index 100% rename from Win32/Blades of Exile Char Editor/editors.cpp rename to Win32/charedit/editors.cpp diff --git a/Win32/Blades of Exile Char Editor/editors.h b/Win32/charedit/editors.h similarity index 100% rename from Win32/Blades of Exile Char Editor/editors.h rename to Win32/charedit/editors.h diff --git a/Win32/Blades of Exile Char Editor/edsound.cpp b/Win32/charedit/edsound.cpp similarity index 100% rename from Win32/Blades of Exile Char Editor/edsound.cpp rename to Win32/charedit/edsound.cpp diff --git a/Win32/Blades of Exile Char Editor/edsound.h b/Win32/charedit/edsound.h similarity index 100% rename from Win32/Blades of Exile Char Editor/edsound.h rename to Win32/charedit/edsound.h diff --git a/Win32/Blades of Exile Char Editor/global.cpp b/Win32/charedit/global.cpp similarity index 100% rename from Win32/Blades of Exile Char Editor/global.cpp rename to Win32/charedit/global.cpp diff --git a/Win32/Blades of Exile Char Editor/global.h b/Win32/charedit/global.h similarity index 100% rename from Win32/Blades of Exile Char Editor/global.h rename to Win32/charedit/global.h diff --git a/Win32/Blades of Exile Char Editor/graphics.cpp b/Win32/charedit/graphics.cpp similarity index 100% rename from Win32/Blades of Exile Char Editor/graphics.cpp rename to Win32/charedit/graphics.cpp diff --git a/Win32/Blades of Exile Char Editor/graphics.h b/Win32/charedit/graphics.h similarity index 100% rename from Win32/Blades of Exile Char Editor/graphics.h rename to Win32/charedit/graphics.h diff --git a/Win32/Blades of Exile Char Editor/graphutl.cpp b/Win32/charedit/graphutl.cpp similarity index 100% rename from Win32/Blades of Exile Char Editor/graphutl.cpp rename to Win32/charedit/graphutl.cpp diff --git a/Win32/Blades of Exile Char Editor/graphutl.h b/Win32/charedit/graphutl.h similarity index 100% rename from Win32/Blades of Exile Char Editor/graphutl.h rename to Win32/charedit/graphutl.h diff --git a/Win32/Blades of Exile/BLADES.RC b/Win32/game/BLADES.RC similarity index 100% rename from Win32/Blades of Exile/BLADES.RC rename to Win32/game/BLADES.RC diff --git a/Win32/Blades of Exile/Blades of Exile.cbp b/Win32/game/Blades of Exile.cbp similarity index 100% rename from Win32/Blades of Exile/Blades of Exile.cbp rename to Win32/game/Blades of Exile.cbp diff --git a/Win32/Blades of Exile/Blades of Exile.dev b/Win32/game/Blades of Exile.dev similarity index 100% rename from Win32/Blades of Exile/Blades of Exile.dev rename to Win32/game/Blades of Exile.dev diff --git a/Win32/Blades of Exile/Blades_of_Exile_private.rc b/Win32/game/Blades_of_Exile_private.rc similarity index 100% rename from Win32/Blades of Exile/Blades_of_Exile_private.rc rename to Win32/game/Blades_of_Exile_private.rc diff --git a/Win32/Blades of Exile/Changes.txt b/Win32/game/Changes.txt similarity index 100% rename from Win32/Blades of Exile/Changes.txt rename to Win32/game/Changes.txt diff --git a/Win32/Blades of Exile/GAMEDLOG.RC b/Win32/game/GAMEDLOG.RC similarity index 100% rename from Win32/Blades of Exile/GAMEDLOG.RC rename to Win32/game/GAMEDLOG.RC diff --git a/Win32/Blades of Exile/GAMESTR.RC b/Win32/game/GAMESTR.RC similarity index 100% rename from Win32/Blades of Exile/GAMESTR.RC rename to Win32/game/GAMESTR.RC diff --git a/Win32/Blades of Exile/Makefile b/Win32/game/Makefile similarity index 100% rename from Win32/Blades of Exile/Makefile rename to Win32/game/Makefile diff --git a/Win32/Blades of Exile/Resources/BLADEXIL.ICO b/Win32/game/Resources/BLADEXIL.ICO similarity index 100% rename from Win32/Blades of Exile/Resources/BLADEXIL.ICO rename to Win32/game/Resources/BLADEXIL.ICO diff --git a/Win32/Blades of Exile/Resources/boot.cur b/Win32/game/Resources/boot.cur similarity index 100% rename from Win32/Blades of Exile/Resources/boot.cur rename to Win32/game/Resources/boot.cur diff --git a/Win32/Blades of Exile/Resources/c.cur b/Win32/game/Resources/c.cur similarity index 100% rename from Win32/Blades of Exile/Resources/c.cur rename to Win32/game/Resources/c.cur diff --git a/Win32/Blades of Exile/Resources/d.cur b/Win32/game/Resources/d.cur similarity index 100% rename from Win32/Blades of Exile/Resources/d.cur rename to Win32/game/Resources/d.cur diff --git a/Win32/Blades of Exile/Resources/dl.cur b/Win32/game/Resources/dl.cur similarity index 100% rename from Win32/Blades of Exile/Resources/dl.cur rename to Win32/game/Resources/dl.cur diff --git a/Win32/Blades of Exile/Resources/dr.cur b/Win32/game/Resources/dr.cur similarity index 100% rename from Win32/Blades of Exile/Resources/dr.cur rename to Win32/game/Resources/dr.cur diff --git a/Win32/Blades of Exile/Resources/key.cur b/Win32/game/Resources/key.cur similarity index 100% rename from Win32/Blades of Exile/Resources/key.cur rename to Win32/game/Resources/key.cur diff --git a/Win32/Blades of Exile/Resources/l.cur b/Win32/game/Resources/l.cur similarity index 100% rename from Win32/Blades of Exile/Resources/l.cur rename to Win32/game/Resources/l.cur diff --git a/Win32/Blades of Exile/Resources/look.cur b/Win32/game/Resources/look.cur similarity index 100% rename from Win32/Blades of Exile/Resources/look.cur rename to Win32/game/Resources/look.cur diff --git a/Win32/Blades of Exile/Resources/r.cur b/Win32/game/Resources/r.cur similarity index 100% rename from Win32/Blades of Exile/Resources/r.cur rename to Win32/game/Resources/r.cur diff --git a/Win32/Blades of Exile/Resources/sword.cur b/Win32/game/Resources/sword.cur similarity index 100% rename from Win32/Blades of Exile/Resources/sword.cur rename to Win32/game/Resources/sword.cur diff --git a/Win32/Blades of Exile/Resources/talk.cur b/Win32/game/Resources/talk.cur similarity index 100% rename from Win32/Blades of Exile/Resources/talk.cur rename to Win32/game/Resources/talk.cur diff --git a/Win32/Blades of Exile/Resources/target.cur b/Win32/game/Resources/target.cur similarity index 100% rename from Win32/Blades of Exile/Resources/target.cur rename to Win32/game/Resources/target.cur diff --git a/Win32/Blades of Exile/Resources/u.cur b/Win32/game/Resources/u.cur similarity index 100% rename from Win32/Blades of Exile/Resources/u.cur rename to Win32/game/Resources/u.cur diff --git a/Win32/Blades of Exile/Resources/ul.cur b/Win32/game/Resources/ul.cur similarity index 100% rename from Win32/Blades of Exile/Resources/ul.cur rename to Win32/game/Resources/ul.cur diff --git a/Win32/Blades of Exile/Resources/ur.cur b/Win32/game/Resources/ur.cur similarity index 100% rename from Win32/Blades of Exile/Resources/ur.cur rename to Win32/game/Resources/ur.cur diff --git a/Win32/Blades of Exile/boe.actions.cpp b/Win32/game/boe.actions.cpp similarity index 100% rename from Win32/Blades of Exile/boe.actions.cpp rename to Win32/game/boe.actions.cpp diff --git a/Win32/Blades of Exile/boe.actions.h b/Win32/game/boe.actions.h similarity index 100% rename from Win32/Blades of Exile/boe.actions.h rename to Win32/game/boe.actions.h diff --git a/Win32/Blades of Exile/boe.combat.cpp b/Win32/game/boe.combat.cpp similarity index 100% rename from Win32/Blades of Exile/boe.combat.cpp rename to Win32/game/boe.combat.cpp diff --git a/Win32/Blades of Exile/boe.combat.h b/Win32/game/boe.combat.h similarity index 100% rename from Win32/Blades of Exile/boe.combat.h rename to Win32/game/boe.combat.h diff --git a/Win32/Blades of Exile/boe.consts.h b/Win32/game/boe.consts.h similarity index 100% rename from Win32/Blades of Exile/boe.consts.h rename to Win32/game/boe.consts.h diff --git a/Win32/Blades of Exile/boe.dlgutil.cpp b/Win32/game/boe.dlgutil.cpp similarity index 100% rename from Win32/Blades of Exile/boe.dlgutil.cpp rename to Win32/game/boe.dlgutil.cpp diff --git a/Win32/Blades of Exile/boe.dlgutil.h b/Win32/game/boe.dlgutil.h similarity index 100% rename from Win32/Blades of Exile/boe.dlgutil.h rename to Win32/game/boe.dlgutil.h diff --git a/Win32/Blades of Exile/boe.fields.cpp b/Win32/game/boe.fields.cpp similarity index 100% rename from Win32/Blades of Exile/boe.fields.cpp rename to Win32/game/boe.fields.cpp diff --git a/Win32/Blades of Exile/boe.fields.h b/Win32/game/boe.fields.h similarity index 100% rename from Win32/Blades of Exile/boe.fields.h rename to Win32/game/boe.fields.h diff --git a/Win32/Blades of Exile/boe.fileio.cpp b/Win32/game/boe.fileio.cpp similarity index 100% rename from Win32/Blades of Exile/boe.fileio.cpp rename to Win32/game/boe.fileio.cpp diff --git a/Win32/Blades of Exile/boe.fileio.h b/Win32/game/boe.fileio.h similarity index 100% rename from Win32/Blades of Exile/boe.fileio.h rename to Win32/game/boe.fileio.h diff --git a/Win32/Blades of Exile/boe.graphics.cpp b/Win32/game/boe.graphics.cpp similarity index 100% rename from Win32/Blades of Exile/boe.graphics.cpp rename to Win32/game/boe.graphics.cpp diff --git a/Win32/Blades of Exile/boe.graphics.h b/Win32/game/boe.graphics.h similarity index 100% rename from Win32/Blades of Exile/boe.graphics.h rename to Win32/game/boe.graphics.h diff --git a/Win32/Blades of Exile/boe.graphutil.cpp b/Win32/game/boe.graphutil.cpp similarity index 100% rename from Win32/Blades of Exile/boe.graphutil.cpp rename to Win32/game/boe.graphutil.cpp diff --git a/Win32/Blades of Exile/boe.graphutil.h b/Win32/game/boe.graphutil.h similarity index 100% rename from Win32/Blades of Exile/boe.graphutil.h rename to Win32/game/boe.graphutil.h diff --git a/Win32/Blades of Exile/boe.infodlg.cpp b/Win32/game/boe.infodlg.cpp similarity index 100% rename from Win32/Blades of Exile/boe.infodlg.cpp rename to Win32/game/boe.infodlg.cpp diff --git a/Win32/Blades of Exile/boe.infodlg.h b/Win32/game/boe.infodlg.h similarity index 100% rename from Win32/Blades of Exile/boe.infodlg.h rename to Win32/game/boe.infodlg.h diff --git a/Win32/Blades of Exile/boe.itemdata.cpp b/Win32/game/boe.itemdata.cpp similarity index 100% rename from Win32/Blades of Exile/boe.itemdata.cpp rename to Win32/game/boe.itemdata.cpp diff --git a/Win32/Blades of Exile/boe.itemdata.h b/Win32/game/boe.itemdata.h similarity index 100% rename from Win32/Blades of Exile/boe.itemdata.h rename to Win32/game/boe.itemdata.h diff --git a/Win32/Blades of Exile/boe.items.cpp b/Win32/game/boe.items.cpp similarity index 100% rename from Win32/Blades of Exile/boe.items.cpp rename to Win32/game/boe.items.cpp diff --git a/Win32/Blades of Exile/boe.items.h b/Win32/game/boe.items.h similarity index 100% rename from Win32/Blades of Exile/boe.items.h rename to Win32/game/boe.items.h diff --git a/Win32/Blades of Exile/boe.locutils.cpp b/Win32/game/boe.locutils.cpp similarity index 100% rename from Win32/Blades of Exile/boe.locutils.cpp rename to Win32/game/boe.locutils.cpp diff --git a/Win32/Blades of Exile/boe.locutils.h b/Win32/game/boe.locutils.h similarity index 100% rename from Win32/Blades of Exile/boe.locutils.h rename to Win32/game/boe.locutils.h diff --git a/Win32/Blades of Exile/boe.main.cpp b/Win32/game/boe.main.cpp similarity index 100% rename from Win32/Blades of Exile/boe.main.cpp rename to Win32/game/boe.main.cpp diff --git a/Win32/Blades of Exile/boe.main.h b/Win32/game/boe.main.h similarity index 100% rename from Win32/Blades of Exile/boe.main.h rename to Win32/game/boe.main.h diff --git a/Win32/Blades of Exile/boe.monster.cpp b/Win32/game/boe.monster.cpp similarity index 100% rename from Win32/Blades of Exile/boe.monster.cpp rename to Win32/game/boe.monster.cpp diff --git a/Win32/Blades of Exile/boe.monster.h b/Win32/game/boe.monster.h similarity index 100% rename from Win32/Blades of Exile/boe.monster.h rename to Win32/game/boe.monster.h diff --git a/Win32/Blades of Exile/boe.newgraph.cpp b/Win32/game/boe.newgraph.cpp similarity index 100% rename from Win32/Blades of Exile/boe.newgraph.cpp rename to Win32/game/boe.newgraph.cpp diff --git a/Win32/Blades of Exile/boe.newgraph.h b/Win32/game/boe.newgraph.h similarity index 100% rename from Win32/Blades of Exile/boe.newgraph.h rename to Win32/game/boe.newgraph.h diff --git a/Win32/Blades of Exile/boe.party.cpp b/Win32/game/boe.party.cpp similarity index 100% rename from Win32/Blades of Exile/boe.party.cpp rename to Win32/game/boe.party.cpp diff --git a/Win32/Blades of Exile/boe.party.h b/Win32/game/boe.party.h similarity index 100% rename from Win32/Blades of Exile/boe.party.h rename to Win32/game/boe.party.h diff --git a/Win32/Blades of Exile/boe.specials.cpp b/Win32/game/boe.specials.cpp similarity index 100% rename from Win32/Blades of Exile/boe.specials.cpp rename to Win32/game/boe.specials.cpp diff --git a/Win32/Blades of Exile/boe.specials.h b/Win32/game/boe.specials.h similarity index 100% rename from Win32/Blades of Exile/boe.specials.h rename to Win32/game/boe.specials.h diff --git a/Win32/Blades of Exile/boe.text.cpp b/Win32/game/boe.text.cpp similarity index 100% rename from Win32/Blades of Exile/boe.text.cpp rename to Win32/game/boe.text.cpp diff --git a/Win32/Blades of Exile/boe.text.h b/Win32/game/boe.text.h similarity index 100% rename from Win32/Blades of Exile/boe.text.h rename to Win32/game/boe.text.h diff --git a/Win32/Blades of Exile/boe.town.cpp b/Win32/game/boe.town.cpp similarity index 100% rename from Win32/Blades of Exile/boe.town.cpp rename to Win32/game/boe.town.cpp diff --git a/Win32/Blades of Exile/boe.town.h b/Win32/game/boe.town.h similarity index 100% rename from Win32/Blades of Exile/boe.town.h rename to Win32/game/boe.town.h diff --git a/Win32/Blades of Exile/classes/consts.h b/Win32/game/classes/consts.h similarity index 100% rename from Win32/Blades of Exile/classes/consts.h rename to Win32/game/classes/consts.h diff --git a/Win32/Blades of Exile/classes/item.cpp b/Win32/game/classes/item.cpp similarity index 100% rename from Win32/Blades of Exile/classes/item.cpp rename to Win32/game/classes/item.cpp diff --git a/Win32/Blades of Exile/classes/item.h b/Win32/game/classes/item.h similarity index 100% rename from Win32/Blades of Exile/classes/item.h rename to Win32/game/classes/item.h diff --git a/Win32/Blades of Exile/classes/location.cpp b/Win32/game/classes/location.cpp similarity index 100% rename from Win32/Blades of Exile/classes/location.cpp rename to Win32/game/classes/location.cpp diff --git a/Win32/Blades of Exile/classes/location.h b/Win32/game/classes/location.h similarity index 100% rename from Win32/Blades of Exile/classes/location.h rename to Win32/game/classes/location.h diff --git a/Win32/Blades of Exile/classes/pc.cpp b/Win32/game/classes/pc.cpp similarity index 100% rename from Win32/Blades of Exile/classes/pc.cpp rename to Win32/game/classes/pc.cpp diff --git a/Win32/Blades of Exile/classes/pc.h b/Win32/game/classes/pc.h similarity index 100% rename from Win32/Blades of Exile/classes/pc.h rename to Win32/game/classes/pc.h diff --git a/Win32/Blades of Exile/global.cpp b/Win32/game/global.cpp similarity index 100% rename from Win32/Blades of Exile/global.cpp rename to Win32/game/global.cpp diff --git a/Win32/Blades of Exile/global.h b/Win32/game/global.h similarity index 100% rename from Win32/Blades of Exile/global.h rename to Win32/game/global.h diff --git a/Win32/Blades of Exile/globvar.cpp b/Win32/game/globvar.cpp similarity index 100% rename from Win32/Blades of Exile/globvar.cpp rename to Win32/game/globvar.cpp diff --git a/Win32/Blades of Exile/globvar.h b/Win32/game/globvar.h similarity index 100% rename from Win32/Blades of Exile/globvar.h rename to Win32/game/globvar.h diff --git a/Win32/Blades of Exile/tools/dlogtool.cpp b/Win32/game/tools/dlogtool.cpp similarity index 100% rename from Win32/Blades of Exile/tools/dlogtool.cpp rename to Win32/game/tools/dlogtool.cpp diff --git a/Win32/Blades of Exile/tools/dlogtool.h b/Win32/game/tools/dlogtool.h similarity index 100% rename from Win32/Blades of Exile/tools/dlogtool.h rename to Win32/game/tools/dlogtool.h diff --git a/Win32/Blades of Exile/tools/mathutil.cpp b/Win32/game/tools/mathutil.cpp similarity index 100% rename from Win32/Blades of Exile/tools/mathutil.cpp rename to Win32/game/tools/mathutil.cpp diff --git a/Win32/Blades of Exile/tools/mathutil.h b/Win32/game/tools/mathutil.h similarity index 100% rename from Win32/Blades of Exile/tools/mathutil.h rename to Win32/game/tools/mathutil.h diff --git a/Win32/Blades of Exile/tools/soundtool.cpp b/Win32/game/tools/soundtool.cpp similarity index 100% rename from Win32/Blades of Exile/tools/soundtool.cpp rename to Win32/game/tools/soundtool.cpp diff --git a/Win32/Blades of Exile/tools/soundtool.h b/Win32/game/tools/soundtool.h similarity index 100% rename from Win32/Blades of Exile/tools/soundtool.h rename to Win32/game/tools/soundtool.h diff --git a/Win32/Blades of Exile/tools/soundvars.cpp b/Win32/game/tools/soundvars.cpp similarity index 100% rename from Win32/Blades of Exile/tools/soundvars.cpp rename to Win32/game/tools/soundvars.cpp diff --git a/Win32/Scenario Editor/1.cur b/Win32/scenedit/1.cur similarity index 100% rename from Win32/Scenario Editor/1.cur rename to Win32/scenedit/1.cur diff --git a/Win32/Scenario Editor/2.cur b/Win32/scenedit/2.cur similarity index 100% rename from Win32/Scenario Editor/2.cur rename to Win32/scenedit/2.cur diff --git a/Win32/Scenario Editor/3.cur b/Win32/scenedit/3.cur similarity index 100% rename from Win32/Scenario Editor/3.cur rename to Win32/scenedit/3.cur diff --git a/Win32/Scenario Editor/4.cur b/Win32/scenedit/4.cur similarity index 100% rename from Win32/Scenario Editor/4.cur rename to Win32/scenedit/4.cur diff --git a/Win32/Scenario Editor/5.cur b/Win32/scenedit/5.cur similarity index 100% rename from Win32/Scenario Editor/5.cur rename to Win32/scenedit/5.cur diff --git a/Win32/Scenario Editor/6.cur b/Win32/scenedit/6.cur similarity index 100% rename from Win32/Scenario Editor/6.cur rename to Win32/scenedit/6.cur diff --git a/Win32/Scenario Editor/7.cur b/Win32/scenedit/7.cur similarity index 100% rename from Win32/Scenario Editor/7.cur rename to Win32/scenedit/7.cur diff --git a/Win32/Scenario Editor/8.cur b/Win32/scenedit/8.cur similarity index 100% rename from Win32/Scenario Editor/8.cur rename to Win32/scenedit/8.cur diff --git a/Win32/Scenario Editor/BLSCENED.ICO b/Win32/scenedit/BLSCENED.ICO similarity index 100% rename from Win32/Scenario Editor/BLSCENED.ICO rename to Win32/scenedit/BLSCENED.ICO diff --git a/Win32/Scenario Editor/BLSCENED.RC b/Win32/scenedit/BLSCENED.RC similarity index 100% rename from Win32/Scenario Editor/BLSCENED.RC rename to Win32/scenedit/BLSCENED.RC diff --git a/Win32/Scenario Editor/Blades of Exile Scenario Editor.cbp b/Win32/scenedit/Blades of Exile Scenario Editor.cbp similarity index 100% rename from Win32/Scenario Editor/Blades of Exile Scenario Editor.cbp rename to Win32/scenedit/Blades of Exile Scenario Editor.cbp diff --git a/Win32/Scenario Editor/Blades of Exile Scenario Editor.dev b/Win32/scenedit/Blades of Exile Scenario Editor.dev similarity index 100% rename from Win32/Scenario Editor/Blades of Exile Scenario Editor.dev rename to Win32/scenedit/Blades of Exile Scenario Editor.dev diff --git a/Win32/Scenario Editor/Blades_of_Exile_Scenario_Editor_private.rc b/Win32/scenedit/Blades_of_Exile_Scenario_Editor_private.rc similarity index 100% rename from Win32/Scenario Editor/Blades_of_Exile_Scenario_Editor_private.rc rename to Win32/scenedit/Blades_of_Exile_Scenario_Editor_private.rc diff --git a/Win32/Scenario Editor/Changes_SE.txt b/Win32/scenedit/Changes_SE.txt similarity index 100% rename from Win32/Scenario Editor/Changes_SE.txt rename to Win32/scenedit/Changes_SE.txt diff --git a/Win32/Scenario Editor/GAMEDLOG.RC b/Win32/scenedit/GAMEDLOG.RC similarity index 100% rename from Win32/Scenario Editor/GAMEDLOG.RC rename to Win32/scenedit/GAMEDLOG.RC diff --git a/Win32/Scenario Editor/Makefile-DevCpp.win b/Win32/scenedit/Makefile-DevCpp.win similarity index 100% rename from Win32/Scenario Editor/Makefile-DevCpp.win rename to Win32/scenedit/Makefile-DevCpp.win diff --git a/Win32/Scenario Editor/Makefile-Nightly-amd64 b/Win32/scenedit/Makefile-Nightly-amd64 similarity index 100% rename from Win32/Scenario Editor/Makefile-Nightly-amd64 rename to Win32/scenedit/Makefile-Nightly-amd64 diff --git a/Win32/Scenario Editor/Makefile-Nightly-i586 b/Win32/scenedit/Makefile-Nightly-i586 similarity index 100% rename from Win32/Scenario Editor/Makefile-Nightly-i586 rename to Win32/scenedit/Makefile-Nightly-i586 diff --git a/Win32/Scenario Editor/STRINGS.RC b/Win32/scenedit/STRINGS.RC similarity index 100% rename from Win32/Scenario Editor/STRINGS.RC rename to Win32/scenedit/STRINGS.RC diff --git a/Win32/Scenario Editor/blscened.cpp b/Win32/scenedit/blscened.cpp similarity index 100% rename from Win32/Scenario Editor/blscened.cpp rename to Win32/scenedit/blscened.cpp diff --git a/Win32/Scenario Editor/buttonmg.cpp b/Win32/scenedit/buttonmg.cpp similarity index 100% rename from Win32/Scenario Editor/buttonmg.cpp rename to Win32/scenedit/buttonmg.cpp diff --git a/Win32/Scenario Editor/buttonmg.h b/Win32/scenedit/buttonmg.h similarity index 100% rename from Win32/Scenario Editor/buttonmg.h rename to Win32/scenedit/buttonmg.h diff --git a/Win32/Scenario Editor/dlogtool.cpp b/Win32/scenedit/dlogtool.cpp similarity index 100% rename from Win32/Scenario Editor/dlogtool.cpp rename to Win32/scenedit/dlogtool.cpp diff --git a/Win32/Scenario Editor/dlogtool.h b/Win32/scenedit/dlogtool.h similarity index 100% rename from Win32/Scenario Editor/dlogtool.h rename to Win32/scenedit/dlogtool.h diff --git a/Win32/Scenario Editor/edsound.cpp b/Win32/scenedit/edsound.cpp similarity index 100% rename from Win32/Scenario Editor/edsound.cpp rename to Win32/scenedit/edsound.cpp diff --git a/Win32/Scenario Editor/edsound.h b/Win32/scenedit/edsound.h similarity index 100% rename from Win32/Scenario Editor/edsound.h rename to Win32/scenedit/edsound.h diff --git a/Win32/Scenario Editor/global.cpp b/Win32/scenedit/global.cpp similarity index 100% rename from Win32/Scenario Editor/global.cpp rename to Win32/scenedit/global.cpp diff --git a/Win32/Scenario Editor/global.h b/Win32/scenedit/global.h similarity index 100% rename from Win32/Scenario Editor/global.h rename to Win32/scenedit/global.h diff --git a/Win32/Scenario Editor/graphics.cpp b/Win32/scenedit/graphics.cpp similarity index 100% rename from Win32/Scenario Editor/graphics.cpp rename to Win32/scenedit/graphics.cpp diff --git a/Win32/Scenario Editor/graphics.h b/Win32/scenedit/graphics.h similarity index 100% rename from Win32/Scenario Editor/graphics.h rename to Win32/scenedit/graphics.h diff --git a/Win32/Scenario Editor/graphutl.cpp b/Win32/scenedit/graphutl.cpp similarity index 100% rename from Win32/Scenario Editor/graphutl.cpp rename to Win32/scenedit/graphutl.cpp diff --git a/Win32/Scenario Editor/graphutl.h b/Win32/scenedit/graphutl.h similarity index 100% rename from Win32/Scenario Editor/graphutl.h rename to Win32/scenedit/graphutl.h diff --git a/Win32/Scenario Editor/keydlgs.cpp b/Win32/scenedit/keydlgs.cpp similarity index 100% rename from Win32/Scenario Editor/keydlgs.cpp rename to Win32/scenedit/keydlgs.cpp diff --git a/Win32/Scenario Editor/keydlgs.h b/Win32/scenedit/keydlgs.h similarity index 100% rename from Win32/Scenario Editor/keydlgs.h rename to Win32/scenedit/keydlgs.h diff --git a/Win32/Scenario Editor/scenario.cpp b/Win32/scenedit/scenario.cpp similarity index 100% rename from Win32/Scenario Editor/scenario.cpp rename to Win32/scenedit/scenario.cpp diff --git a/Win32/Scenario Editor/scenario.h b/Win32/scenedit/scenario.h similarity index 100% rename from Win32/Scenario Editor/scenario.h rename to Win32/scenedit/scenario.h diff --git a/Win32/Scenario Editor/snd0.wav b/Win32/scenedit/snd0.wav similarity index 100% rename from Win32/Scenario Editor/snd0.wav rename to Win32/scenedit/snd0.wav diff --git a/Win32/Scenario Editor/snd1.wav b/Win32/scenedit/snd1.wav similarity index 100% rename from Win32/Scenario Editor/snd1.wav rename to Win32/scenedit/snd1.wav diff --git a/Win32/Scenario Editor/snd34.wav b/Win32/scenedit/snd34.wav similarity index 100% rename from Win32/Scenario Editor/snd34.wav rename to Win32/scenedit/snd34.wav diff --git a/Win32/Scenario Editor/snd37.wav b/Win32/scenedit/snd37.wav similarity index 100% rename from Win32/Scenario Editor/snd37.wav rename to Win32/scenedit/snd37.wav diff --git a/Win32/Scenario Editor/snd95.wav b/Win32/scenedit/snd95.wav similarity index 100% rename from Win32/Scenario Editor/snd95.wav rename to Win32/scenedit/snd95.wav diff --git a/Win32/Scenario Editor/tactions.cpp b/Win32/scenedit/tactions.cpp similarity index 100% rename from Win32/Scenario Editor/tactions.cpp rename to Win32/scenedit/tactions.cpp diff --git a/Win32/Scenario Editor/tactions.h b/Win32/scenedit/tactions.h similarity index 100% rename from Win32/Scenario Editor/tactions.h rename to Win32/scenedit/tactions.h diff --git a/Win32/Scenario Editor/tfileio.cpp b/Win32/scenedit/tfileio.cpp similarity index 100% rename from Win32/Scenario Editor/tfileio.cpp rename to Win32/scenedit/tfileio.cpp diff --git a/Win32/Scenario Editor/tfileio.h b/Win32/scenedit/tfileio.h similarity index 100% rename from Win32/Scenario Editor/tfileio.h rename to Win32/scenedit/tfileio.h diff --git a/Win32/Scenario Editor/townout.cpp b/Win32/scenedit/townout.cpp similarity index 100% rename from Win32/Scenario Editor/townout.cpp rename to Win32/scenedit/townout.cpp diff --git a/Win32/Scenario Editor/townout.h b/Win32/scenedit/townout.h similarity index 100% rename from Win32/Scenario Editor/townout.h rename to Win32/scenedit/townout.h From 08928af0ac1fde2ce674d843a81f4bd1a4c75903 Mon Sep 17 00:00:00 2001 From: Sylae Corell Date: Tue, 17 Jun 2014 15:24:18 -0600 Subject: [PATCH 3/7] Remove verbose output flag from makefile --- Win32/game/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Win32/game/Makefile b/Win32/game/Makefile index 9ac67f4d..6f26d752 100644 --- a/Win32/game/Makefile +++ b/Win32/game/Makefile @@ -10,7 +10,7 @@ LIBS = -mwindows -lwinmm -static-libgcc -static-libstdc++ INCS = -I"include" CXXINCS = BIN = "Blades of Exile.exe" -CXXFLAGS = $(CXXINCS) -Wall -O2 -v +CXXFLAGS = $(CXXINCS) -Wall -O2 CFLAGS = $(INCS) -O2 RM = rm -f From a49529e1c3dbcdf8f3f57b3ffaed7ada604fba61 Mon Sep 17 00:00:00 2001 From: Sylae Jiendra Corell Date: Tue, 17 Jun 2014 16:03:20 -0600 Subject: [PATCH 4/7] Makefiles for CharEd, ScenEd --- .../{Makefile-Nightly-i586 => Makefile} | 11 ++-- Win32/charedit/Makefile-Nightly-amd64 | 57 ---------------- .../{Makefile-DevCpp.win => Makefile} | 11 ++-- Win32/scenedit/Makefile-Nightly-amd64 | 66 ------------------- Win32/scenedit/Makefile-Nightly-i586 | 66 ------------------- 5 files changed, 10 insertions(+), 201 deletions(-) rename Win32/charedit/{Makefile-Nightly-i586 => Makefile} (85%) delete mode 100644 Win32/charedit/Makefile-Nightly-amd64 rename Win32/scenedit/{Makefile-DevCpp.win => Makefile} (87%) delete mode 100644 Win32/scenedit/Makefile-Nightly-amd64 delete mode 100644 Win32/scenedit/Makefile-Nightly-i586 diff --git a/Win32/charedit/Makefile-Nightly-i586 b/Win32/charedit/Makefile similarity index 85% rename from Win32/charedit/Makefile-Nightly-i586 rename to Win32/charedit/Makefile index d2343d4b..4a3fb9d2 100644 --- a/Win32/charedit/Makefile-Nightly-i586 +++ b/Win32/charedit/Makefile @@ -1,13 +1,12 @@ -# Project: Blades of Exile Character Editor -# Makefile created by Dev-C++ 4.9.9.2 +include ../.config.vars -CPP = i586-mingw32msvc-g++ -CC = i586-mingw32msvc-gcc -WINDRES = i586-mingw32msvc-windres +CPP = $(PREFIX)g++ +CC = $(PREFIX)gcc +WINDRES = $(PREFIX)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 +LIBS = -lwinmm -mwindows -lwinmm -static-libgcc -static-libstdc++ INCS = -I"include" CXXINCS = BIN = "Blades of Exile Character Editor.exe" diff --git a/Win32/charedit/Makefile-Nightly-amd64 b/Win32/charedit/Makefile-Nightly-amd64 deleted file mode 100644 index 17724e16..00000000 --- a/Win32/charedit/Makefile-Nightly-amd64 +++ /dev/null @@ -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 diff --git a/Win32/scenedit/Makefile-DevCpp.win b/Win32/scenedit/Makefile similarity index 87% rename from Win32/scenedit/Makefile-DevCpp.win rename to Win32/scenedit/Makefile index ecdf718b..def55b2b 100644 --- a/Win32/scenedit/Makefile-DevCpp.win +++ b/Win32/scenedit/Makefile @@ -1,13 +1,12 @@ -# Project: Blades of Exile Scenario Editor -# Makefile created by Dev-C++ 4.9.9.2 +include ../.config.vars -CPP = g++.exe -CC = gcc.exe -WINDRES = windres.exe +CPP = $(PREFIX)g++.exe +CC = $(PREFIX)gcc.exe +WINDRES = $(PREFIX)windres.exe 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 = -L"C:/Dev-Cpp/lib/GTK+" -mwindows -lwinmm --strip-all +LIBS = -mwindows -lwinmm --strip-all -static-libgcc -static-libstdc++ INCS = -I"include" CXXINCS = BIN = "Blades of Exile Scenario Editor.exe" diff --git a/Win32/scenedit/Makefile-Nightly-amd64 b/Win32/scenedit/Makefile-Nightly-amd64 deleted file mode 100644 index d016ff1d..00000000 --- a/Win32/scenedit/Makefile-Nightly-amd64 +++ /dev/null @@ -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 diff --git a/Win32/scenedit/Makefile-Nightly-i586 b/Win32/scenedit/Makefile-Nightly-i586 deleted file mode 100644 index 2a575538..00000000 --- a/Win32/scenedit/Makefile-Nightly-i586 +++ /dev/null @@ -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 From fb45c7677bf619097873bc28c86ebb258b8430f2 Mon Sep 17 00:00:00 2001 From: Sylae Corell Date: Tue, 17 Jun 2014 16:14:35 -0600 Subject: [PATCH 5/7] Remove exe extensions from makefile --- Win32/scenedit/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Win32/scenedit/Makefile b/Win32/scenedit/Makefile index def55b2b..1c2f8333 100644 --- a/Win32/scenedit/Makefile +++ b/Win32/scenedit/Makefile @@ -1,8 +1,8 @@ include ../.config.vars -CPP = $(PREFIX)g++.exe -CC = $(PREFIX)gcc.exe -WINDRES = $(PREFIX)windres.exe +CPP = $(PREFIX)g++ +CC = $(PREFIX)gcc +WINDRES = $(PREFIX)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) From 039ef4d1436487d82b40daf1066dddfbba78bc69 Mon Sep 17 00:00:00 2001 From: Sylae Corell Date: Wed, 18 Jun 2014 13:24:51 -0600 Subject: [PATCH 6/7] Game compiles again under 32-bit! --- Win32/game/boe.main.cpp | 18 ++++++++++++++++++ Win32/game/tools/dlogtool.cpp | 14 ++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/Win32/game/boe.main.cpp b/Win32/game/boe.main.cpp index 24cb21f5..445d1422 100644 --- a/Win32/game/boe.main.cpp +++ b/Win32/game/boe.main.cpp @@ -18,6 +18,24 @@ #include "globvar.h" +// Check windows +#if _WIN32 || _WIN64 +#if _WIN64 +#define ENVIRONMENT64 +#else +#define ENVIRONMENT32 +#endif +#endif + +// Check GCC +#if __GNUC__ +#if __x86_64__ || __ppc64__ +#define ENVIRONMENT64 +#else +#define ENVIRONMENT32 +#endif +#endif + void startup_load() { load_file(); diff --git a/Win32/game/tools/dlogtool.cpp b/Win32/game/tools/dlogtool.cpp index 638b9c8a..55a6689e 100644 --- a/Win32/game/tools/dlogtool.cpp +++ b/Win32/game/tools/dlogtool.cpp @@ -47,7 +47,12 @@ short item_label_loc[NI]; inline void cd_kill_dc(short which_slot,HDC hdc) { fry_dc(dlgs[which_slot],hdc); } -LRESULT CALLBACK dummy_dialog_proc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +#ifdef ENVIRONMENT64 +LRESULT +#else +BOOL +#endif +CALLBACK dummy_dialog_proc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); LRESULT CALLBACK fresh_edit_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); LRESULT CALLBACK WndProc (HWND, UINT, WPARAM, LPARAM); @@ -542,7 +547,12 @@ short cd_create_dialog(short dlog_num, HWND parent) return 0; } -LRESULT CALLBACK dummy_dialog_proc (HWND hDlg, UINT message, WPARAM, LPARAM) +#ifdef ENVIRONMENT64 +LRESULT +#else +BOOL +#endif +CALLBACK dummy_dialog_proc (HWND hDlg, UINT message, WPARAM, LPARAM) { short i,j,k,free_slot = -1,free_item = -1; int type, flag; From 69ffd4cee360fc29a14d2494499e282377fe5883 Mon Sep 17 00:00:00 2001 From: Sylae Jiendra Corell Date: Wed, 18 Jun 2014 14:00:57 -0600 Subject: [PATCH 7/7] Fixed 64-bit compiliation, edited configure script to allow setting of 64-bit operations --- Win32/configure | 13 ++++++++++--- Win32/game/Makefile | 2 +- Win32/game/boe.main.cpp | 18 ------------------ 3 files changed, 11 insertions(+), 22 deletions(-) diff --git a/Win32/configure b/Win32/configure index 43181688..4f86256e 100755 --- a/Win32/configure +++ b/Win32/configure @@ -7,11 +7,14 @@ import subprocess def main(): args = parser().parse_args() src_path = os.path.dirname(__file__) or '.' - -# shutil.copy(os.path.realpath(src_path) + '/Makefile.in', os.getcwd() + '/Makefile') - + + args.flags = '' + if args.sixfour: + args.flags = '-DENVIRONMENT64' + open('.config.vars', 'w+').write( '''PREFIX={prefix} +FLAGS={flags} '''.format(**vars(args))) @@ -25,6 +28,10 @@ def parser(): '-c', '--compiler', type=str, help='Compiler prefix, such as i686-w64-mingw32-', dest='prefix', metavar='PREFIX', default='' ) + parser.add_argument( + '--64', action='store_const', + help='Sets flag for 64-bit compiliation', dest='sixfour', const=True, default=False + ) return parser main() diff --git a/Win32/game/Makefile b/Win32/game/Makefile index 6f26d752..ea77acb7 100644 --- a/Win32/game/Makefile +++ b/Win32/game/Makefile @@ -10,7 +10,7 @@ LIBS = -mwindows -lwinmm -static-libgcc -static-libstdc++ INCS = -I"include" CXXINCS = BIN = "Blades of Exile.exe" -CXXFLAGS = $(CXXINCS) -Wall -O2 +CXXFLAGS = $(CXXINCS) -Wall -O2 $(FLAGS) CFLAGS = $(INCS) -O2 RM = rm -f diff --git a/Win32/game/boe.main.cpp b/Win32/game/boe.main.cpp index 445d1422..24cb21f5 100644 --- a/Win32/game/boe.main.cpp +++ b/Win32/game/boe.main.cpp @@ -18,24 +18,6 @@ #include "globvar.h" -// Check windows -#if _WIN32 || _WIN64 -#if _WIN64 -#define ENVIRONMENT64 -#else -#define ENVIRONMENT32 -#endif -#endif - -// Check GCC -#if __GNUC__ -#if __x86_64__ || __ppc64__ -#define ENVIRONMENT64 -#else -#define ENVIRONMENT32 -#endif -#endif - void startup_load() { load_file();