Skip to content

Commit 4a305da

Browse files
draconisPWdraconisPW
committed
Adding missing DLLs + code cleanup
1 parent 3aacd03 commit 4a305da

21 files changed

+16
-22
lines changed

‎.gitignore

-6
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,7 @@
44
/mangclient.ini
55
/mangclient_gcu.ini
66
/mangclient_sdl.ini
7-
/pdcurses.dll
87
/Roadmap.txt
9-
/SDL.dll
10-
/SDL_image.dll
11-
/SDL_mixer.dll
12-
/SDL_ttf.dll
13-
/freetype.dll
148
/mangband.cfg
159
*.o
1610
# Vanilla stuff:

‎SDL.dll

322 KB
Binary file not shown.

‎SDL_image.dll

241 KB
Binary file not shown.

‎SDL_mixer.dll

194 KB
Binary file not shown.

‎SDL_ttf.dll

63 KB
Binary file not shown.

‎changes.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -103,4 +103,5 @@ Compilation
103103
-----------
104104

105105
- Update help
106-
- USE_NCURSES define
106+
- USE_NCURSES define
107+
- Compiling with Embarcadero C++ 7.20

‎docs/hacking/compiling.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Compiling Instructions
33

44
PWMAngband is usually built and run under Windows. If you're using Linux, you
55
can get the PWMAngband binaries directly and use WinE. Otherwise, a few
6-
makefiles have been added to compile under Linux. Check the compiling.txt for
7-
that.
6+
makefiles have been added to compile under Linux. Check the compiling.txt file
7+
for instructions.
88

99
PWMAngband comes with various text files that explain how to compile the game
1010
and several batch files that actually do the job.

‎freetype.dll

566 KB
Binary file not shown.

‎pdcurses.dll

116 KB
Binary file not shown.

‎src/bcc32c/WIN.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ pause
1111
copy png.h ..\PWMAngband\src\win
1212
copy pnglibconf.h ..\PWMAngband\src\win
1313
copy pngconf.h ..\PWMAngband\src\win
14-
pause
14+
pause

‎src/bcc32c/clean.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
make -f makefile.bcc clean
2-
pause
2+
pause

‎src/bcc32c/client.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ make -f makefile.bcc
2121
pause
2222
move mangclient_gcu.exe ..\..\mangclient_gcu.exe
2323
move mangclient_sdl.exe ..\..\mangclient_sdl.exe
24-
move mangclient.exe ..\..\mangclient.exe
24+
move mangclient.exe ..\..\mangclient.exe

‎src/bcc32c/makefile.bcc

+1-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ CLI_EXE = mangclient.exe
5959
# Set any compiler options
6060

6161
CCOPTS = -tW -lGn \
62-
-D_WIN32_WINNT=0x0500 -DWINVER=0x0500 \
62+
-D_WIN32_WINNT=0x0500 -DWINVER=0x0500 -D__BCC7__ \
6363
-DWIN32 -D_WINDOWS -DSTRICT -DWINDOWS -DBCC_IDE \
6464
-I$(BCCDIR)\include
6565

@@ -502,4 +502,3 @@ $(CLI_EXE): $(CLI_OBJS) ..\win\angband.res
502502

503503
.obj.exe:
504504
$(CPP) $(CPPFLAGS) $<
505-

‎src/bcc32c/makefile.gcu

+1-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ CLI_EXE = mangclient_gcu.exe
3636
# Set any compiler options
3737

3838
CCOPTS = -tW -lGn \
39-
-D_WIN32_WINNT=0x0500 -DWINVER=0x0500 \
39+
-D_WIN32_WINNT=0x0500 -DWINVER=0x0500 -D__BCC7__ \
4040
-DWIN32 -D_WINDOWS -DSTRICT -DWINDOWS -DUSE_GCU -DBCC_IDE \
4141
-I$(BCCDIR)\include -I..\curses
4242

@@ -192,4 +192,3 @@ $(CLI_EXE): $(CLI_OBJS) ..\win\angband.res
192192

193193
.obj.exe:
194194
$(CPP) $(CPPFLAGS) $<
195-

‎src/bcc32c/makefile.sdl

-1
Original file line numberDiff line numberDiff line change
@@ -196,4 +196,3 @@ $(CLI_EXE): $(CLI_OBJS) ..\win\angband.res
196196

197197
.obj.exe:
198198
$(CPP) $(CPPFLAGS) $<
199-

‎src/bcc32c/server.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
make -f makefile.bcc server
22
pause
3-
move mangband.exe ..\..\mangband.exe
3+
move mangband.exe ..\..\mangband.exe

‎src/client/ui-birth.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -1023,7 +1023,7 @@ static enum birth_stage menu_question(enum birth_stage current, struct menu *cur
10231023
player->clazz = player_id2class(current_menu->cursor);
10241024
break;
10251025
case BIRTH_ROLLER_CHOICE: roller_type = current_menu->cursor; break;
1026-
default: break;
1026+
default: break;
10271027
}
10281028

10291029
menu_refresh(current_menu, false);
@@ -1480,8 +1480,8 @@ void textui_do_birth(void)
14801480
case BIRTH_QUIT:
14811481
free_birth_menus();
14821482
quit(NULL);
1483-
1484-
default: break;
1483+
1484+
default: break;
14851485
}
14861486

14871487
current_stage = next;

‎src/server/map-ui.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ static void grid_get_attr(struct player *p, struct grid_data *g, u16b *a)
504504
}
505505
case LIGHTING_LIT: *a = get_color(*a, ATTR_DARK, 1); break;
506506
case LIGHTING_DARK: *a = get_color(*a, ATTR_DARK, 2); break;
507-
default: break;
507+
default: break;
508508
}
509509
}
510510

‎src/win/angband.rc

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
/* File: angband.rc */
2+
#ifdef __BCC7__
23
#include <winres.h>
4+
#endif
35
#include "win-menu.h"
46

57
ANGBAND MENU

‎src/win/libpng.lib

-164 KB
Binary file not shown.

‎src/win/zlib.lib

-17.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)