Skip to content
Permalink
Browse files
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!
  • Loading branch information
sylae committed Jun 17, 2014
1 parent a4430cd commit 29906153cf725a0daf0df27812fc3dd67dde6203
Showing with 86 additions and 247 deletions.
  1. +5 −1 .gitignore
  2. +6 −7 Win32/Blades of Exile/{Makefile-DevCpp.win → Makefile}
  3. +0 −111 Win32/Blades of Exile/Makefile-Nightly-amd64
  4. +0 −111 Win32/Blades of Exile/Makefile-Nightly-i586
  5. +2 −2 Win32/Blades of Exile/boe.actions.h
  6. +2 −2 Win32/Blades of Exile/boe.dlgutil.cpp
  7. +2 −2 Win32/Blades of Exile/boe.fileio.cpp
  8. +1 −1 Win32/Blades of Exile/boe.main.cpp
  9. +1 −1 Win32/Blades of Exile/boe.main.h
  10. +6 −6 Win32/Blades of Exile/tools/dlogtool.cpp
  11. +3 −3 Win32/Blades of Exile/tools/dlogtool.h
  12. +28 −0 Win32/Boesounds DLL/Makefile
  13. BIN Win32/Boesounds DLL/sounds/{SND0.WAV → snd0.wav}
  14. BIN Win32/Boesounds DLL/sounds/{SND1.WAV → snd1.wav}
  15. BIN Win32/Boesounds DLL/sounds/{SND10.WAV → snd10.wav}
  16. BIN Win32/Boesounds DLL/sounds/{SND11.WAV → snd11.wav}
  17. BIN Win32/Boesounds DLL/sounds/{SND12.WAV → snd12.wav}
  18. BIN Win32/Boesounds DLL/sounds/{SND13.WAV → snd13.wav}
  19. BIN Win32/Boesounds DLL/sounds/{SND14.WAV → snd14.wav}
  20. BIN Win32/Boesounds DLL/sounds/{SND15.WAV → snd15.wav}
  21. BIN Win32/Boesounds DLL/sounds/{SND16.WAV → snd16.wav}
  22. BIN Win32/Boesounds DLL/sounds/{SND17.WAV → snd17.wav}
  23. BIN Win32/Boesounds DLL/sounds/{SND18.WAV → snd18.wav}
  24. BIN Win32/Boesounds DLL/sounds/{SND19.WAV → snd19.wav}
  25. BIN Win32/Boesounds DLL/sounds/{SND2.WAV → snd2.wav}
  26. BIN Win32/Boesounds DLL/sounds/{SND20.WAV → snd20.wav}
  27. BIN Win32/Boesounds DLL/sounds/{SND21.WAV → snd21.wav}
  28. BIN Win32/Boesounds DLL/sounds/{SND22.WAV → snd22.wav}
  29. BIN Win32/Boesounds DLL/sounds/{SND23.WAV → snd23.wav}
  30. BIN Win32/Boesounds DLL/sounds/{SND24.WAV → snd24.wav}
  31. BIN Win32/Boesounds DLL/sounds/{SND25.WAV → snd25.wav}
  32. BIN Win32/Boesounds DLL/sounds/{SND26.WAV → snd26.wav}
  33. BIN Win32/Boesounds DLL/sounds/{SND27.WAV → snd27.wav}
  34. BIN Win32/Boesounds DLL/sounds/{SND28.WAV → snd28.wav}
  35. BIN Win32/Boesounds DLL/sounds/{SND29.WAV → snd29.wav}
  36. BIN Win32/Boesounds DLL/sounds/{SND3.WAV → snd3.wav}
  37. BIN Win32/Boesounds DLL/sounds/{SND30.WAV → snd30.wav}
  38. BIN Win32/Boesounds DLL/sounds/{SND31.WAV → snd31.wav}
  39. BIN Win32/Boesounds DLL/sounds/{SND32.WAV → snd32.wav}
  40. BIN Win32/Boesounds DLL/sounds/{SND33.WAV → snd33.wav}
  41. BIN Win32/Boesounds DLL/sounds/{SND34.WAV → snd34.wav}
  42. BIN Win32/Boesounds DLL/sounds/{SND35.WAV → snd35.wav}
  43. BIN Win32/Boesounds DLL/sounds/{SND36.WAV → snd36.wav}
  44. BIN Win32/Boesounds DLL/sounds/{SND37.WAV → snd37.wav}
  45. BIN Win32/Boesounds DLL/sounds/{SND38.WAV → snd38.wav}
  46. BIN Win32/Boesounds DLL/sounds/{SND39.WAV → snd39.wav}
  47. BIN Win32/Boesounds DLL/sounds/{SND4.WAV → snd4.wav}
  48. BIN Win32/Boesounds DLL/sounds/{SND40.WAV → snd40.wav}
  49. BIN Win32/Boesounds DLL/sounds/{SND41.WAV → snd41.wav}
  50. BIN Win32/Boesounds DLL/sounds/{SND42.WAV → snd42.wav}
  51. BIN Win32/Boesounds DLL/sounds/{SND43.WAV → snd43.wav}
  52. BIN Win32/Boesounds DLL/sounds/{SND44.WAV → snd44.wav}
  53. BIN Win32/Boesounds DLL/sounds/{SND45.WAV → snd45.wav}
  54. BIN Win32/Boesounds DLL/sounds/{SND46.WAV → snd46.wav}
  55. BIN Win32/Boesounds DLL/sounds/{SND47.WAV → snd47.wav}
  56. BIN Win32/Boesounds DLL/sounds/{SND48.WAV → snd48.wav}
  57. BIN Win32/Boesounds DLL/sounds/{SND49.WAV → snd49.wav}
  58. BIN Win32/Boesounds DLL/sounds/{SND5.WAV → snd5.wav}
  59. BIN Win32/Boesounds DLL/sounds/{SND50.WAV → snd50.wav}
  60. BIN Win32/Boesounds DLL/sounds/{SND51.WAV → snd51.wav}
  61. BIN Win32/Boesounds DLL/sounds/{SND52.WAV → snd52.wav}
  62. BIN Win32/Boesounds DLL/sounds/{SND53.WAV → snd53.wav}
  63. BIN Win32/Boesounds DLL/sounds/{SND54.WAV → snd54.wav}
  64. BIN Win32/Boesounds DLL/sounds/{SND55.WAV → snd55.wav}
  65. BIN Win32/Boesounds DLL/sounds/{SND56.WAV → snd56.wav}
  66. BIN Win32/Boesounds DLL/sounds/{SND57.WAV → snd57.wav}
  67. BIN Win32/Boesounds DLL/sounds/{SND58.WAV → snd58.wav}
  68. BIN Win32/Boesounds DLL/sounds/{SND59.WAV → snd59.wav}
  69. BIN Win32/Boesounds DLL/sounds/{SND6.WAV → snd6.wav}
  70. BIN Win32/Boesounds DLL/sounds/{SND60.WAV → snd60.wav}
  71. BIN Win32/Boesounds DLL/sounds/{SND61.WAV → snd61.wav}
  72. BIN Win32/Boesounds DLL/sounds/{SND62.WAV → snd62.wav}
  73. BIN Win32/Boesounds DLL/sounds/{SND63.WAV → snd63.wav}
  74. BIN Win32/Boesounds DLL/sounds/{SND64.WAV → snd64.wav}
  75. BIN Win32/Boesounds DLL/sounds/{SND65.WAV → snd65.wav}
  76. BIN Win32/Boesounds DLL/sounds/{SND66.WAV → snd66.wav}
  77. BIN Win32/Boesounds DLL/sounds/{SND67.WAV → snd67.wav}
  78. BIN Win32/Boesounds DLL/sounds/{SND68.WAV → snd68.wav}
  79. BIN Win32/Boesounds DLL/sounds/{SND69.WAV → snd69.wav}
  80. BIN Win32/Boesounds DLL/sounds/{SND7.WAV → snd7.wav}
  81. BIN Win32/Boesounds DLL/sounds/{SND70.WAV → snd70.wav}
  82. BIN Win32/Boesounds DLL/sounds/{SND71.WAV → snd71.wav}
  83. BIN Win32/Boesounds DLL/sounds/{SND72.WAV → snd72.wav}
  84. BIN Win32/Boesounds DLL/sounds/{SND73.WAV → snd73.wav}
  85. BIN Win32/Boesounds DLL/sounds/{SND74.WAV → snd74.wav}
  86. BIN Win32/Boesounds DLL/sounds/{SND75.WAV → snd75.wav}
  87. BIN Win32/Boesounds DLL/sounds/{SND76.WAV → snd76.wav}
  88. BIN Win32/Boesounds DLL/sounds/{SND77.WAV → snd77.wav}
  89. BIN Win32/Boesounds DLL/sounds/{SND78.WAV → snd78.wav}
  90. BIN Win32/Boesounds DLL/sounds/{SND79.WAV → snd79.wav}
  91. BIN Win32/Boesounds DLL/sounds/{SND8.WAV → snd8.wav}
  92. BIN Win32/Boesounds DLL/sounds/{SND80.WAV → snd80.wav}
  93. BIN Win32/Boesounds DLL/sounds/{SND81.WAV → snd81.wav}
  94. BIN Win32/Boesounds DLL/sounds/{SND82.WAV → snd82.wav}
  95. BIN Win32/Boesounds DLL/sounds/{SND83.WAV → snd83.wav}
  96. BIN Win32/Boesounds DLL/sounds/{SND84.WAV → snd84.wav}
  97. BIN Win32/Boesounds DLL/sounds/{SND85.WAV → snd85.wav}
  98. BIN Win32/Boesounds DLL/sounds/{SND86.WAV → snd86.wav}
  99. BIN Win32/Boesounds DLL/sounds/{SND87.WAV → snd87.wav}
  100. BIN Win32/Boesounds DLL/sounds/{SND88.WAV → snd88.wav}
  101. BIN Win32/Boesounds DLL/sounds/{SND89.WAV → snd89.wav}
  102. BIN Win32/Boesounds DLL/sounds/{SND9.WAV → snd9.wav}
  103. BIN Win32/Boesounds DLL/sounds/{SND90.WAV → snd90.wav}
  104. BIN Win32/Boesounds DLL/sounds/{SND91.WAV → snd91.wav}
  105. BIN Win32/Boesounds DLL/sounds/{SND92.WAV → snd92.wav}
  106. BIN Win32/Boesounds DLL/sounds/{SND93.WAV → snd93.wav}
  107. BIN Win32/Boesounds DLL/sounds/{SND94.WAV → snd94.wav}
  108. BIN Win32/Boesounds DLL/sounds/{SND95.WAV → snd95.wav}
  109. BIN Win32/Boesounds DLL/sounds/{SND96.WAV → snd96.wav}
  110. BIN Win32/Boesounds DLL/sounds/{SND97.WAV → snd97.wav}
  111. BIN Win32/Boesounds DLL/sounds/{SND98.WAV → snd98.wav}
  112. BIN Win32/Boesounds DLL/sounds/{SND99.WAV → snd99.wav}
  113. +30 −0 Win32/configure
@@ -2,10 +2,12 @@
*.slo
*.lo
*.o
*.res

# Compiled Dynamic libraries
*.so
*.dylib
*.dll

# Compiled Static libraries
*.lai
@@ -22,4 +24,6 @@ Win32/*/bin
Win32/*/obj
*.layout
*.depend
*blades.ini
*blades.ini

.config.vars
@@ -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

This file was deleted.

This file was deleted.

@@ -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();
@@ -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);
}

@@ -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);

@@ -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;
@@ -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
@@ -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);
@@ -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);

0 comments on commit 2990615

Please sign in to comment.