openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Added makefiles for cross-compilation to Win32 from linux systems.

Browse Source 
-Added Makefile-Nightly-* for compilation using mingw32. amd64 makefiles currently not working due to mysteriousness in the apt repo (*)
-corrected cases in BLADPCED.RC, BLADES.RC, and BLSCENED.RC so they build properly on case-sensitive systems (*)
-Fixed a typecasting error in dlogtool.cpp and a random comma error in tfileio.cpp (ScenEd)
-Added *_private.rc files to repo to prevent build anarchy with windres.

git-svn-id: http://openexile.googlecode.com/svn/trunk@166 4ebdad44-0ea0-11de-aab3-ff745001d230
This commit is contained in:
Sylae Corell
2012-02-25 03:57:36 +00:00
parent c8200e94ac
commit 159306424f
14 changed files with 521 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Win32/Scenario Editor/BLSCENED.RC
View File

@@ -268,5 +268,5 @@ ACCELERATORS_1 ACCELERATORS
137 CURSOR "8.cur"
10 ICON "blscened.ico"
10 ICON "BLSCENED.ICO"

7
Win32/Scenario Editor/Blades_of_Exile_Scenario_Editor_private.rc Normal file
View File

@@ -0,0 +1,7 @@
/* THIS FILE WILL BE OVERWRITTEN BY DEV-C++ */
/* DO NOT EDIT! */
#include "BLSCENED.RC"
#include "GAMEDLOG.RC"
#include "STRINGS.RC"

66
Win32/Scenario Editor/Makefile-Nightly-amd64 Normal file
View File

@@ -0,0 +1,66 @@
# 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

66
Win32/Scenario Editor/Makefile-Nightly-i586 Normal file
View File

@@ -0,0 +1,66 @@
# 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

20
Win32/Scenario Editor/dlogtool.cpp
View File

@@ -53,7 +53,7 @@ short item_flag[NI];
char item_active[NI];
char item_key[NI];
short item_label[NI];
short item_label_loc[NI];
short item_label_loc[NI];
short custom_type[NI];//0 - not custom, 1 - 1x1, 2 - 2x1, 3 - 1x2, 4 - 2x2, 5 - animated custom
char text_long_str[10][256];
@@ -573,7 +573,7 @@ short cd_kill_dialog(short dlog_num,short parent_message)
SetFocus(dlg_parent[which_dlg]);
SetWindowPos(dlg_parent[which_dlg],HWND_TOP,0,0,100,100,
SWP_NOMOVE | SWP_NOSIZE | SWP_NOREDRAW);
cd_set_edit_focus((short)dlg_parent[which_dlg]);
cd_set_edit_focus((size_t)dlg_parent[which_dlg]);
}
if (parent_message > 0)
@@ -724,13 +724,13 @@ void cd_set_pict(short dlog_num, short item_num, short pict_num, short custom_pi
beep();
return;
}
item_flag[item_index] = pict_num;
item_flag[item_index] = pict_num;
custom_type[item_index] = custom_pic_type;
if (pict_num == -1)
cd_erase_item(dlog_num,item_num);
else cd_draw_item(dlog_num,item_num);
}
void cd_activate_item(short dlog_num, short item_num, short status)
{
short dlg_index,item_index;
@@ -845,8 +845,8 @@ cd_set_item_text( dlog_num, item_num, str);
void csp(short dlog_num, short item_num, short pict_num, short custom_pic_type)
{
cd_set_pict( dlog_num, item_num, pict_num, custom_pic_type);
}
}
void cd_set_item_text(short dlog_num, short item_num, char *str)
{
short dlg_index,item_index,i;
@@ -1086,10 +1086,10 @@ void cd_draw_item(short dlog_num,short item_num)
case 5:
if (item_flag[item_index] == -1)
cd_erase_item(dlog_num,item_num);
else if(custom_type[item_index] > 0){
draw_custom_dialog_graphic(dlgs[dlg_index], item_rect[item_index],
item_flag[item_index], TRUE,0, custom_type[item_index]);
}
else if(custom_type[item_index] > 0){
draw_custom_dialog_graphic(dlgs[dlg_index], item_rect[item_index],
item_flag[item_index], TRUE,0, custom_type[item_index]);
}
else draw_dialog_graphic(dlgs[dlg_index], item_rect[item_index],
item_flag[item_index],(item_flag[item_index] >= 2000) ? FALSE : TRUE,0);
break;

2
Win32/Scenario Editor/tfileio.cpp
View File

@@ -3099,7 +3099,7 @@ void port_dummy_talk_nodes()
void port_t_d()
{
short i,;
short i;
if (cur_scen_is_win == TRUE)
return;