Skip to content

Commit 51184f7

Browse files
author
bagheadspidey
committed
1 parent cd9748f commit 51184f7

File tree

8 files changed

+35
-24
lines changed

8 files changed

+35
-24
lines changed

build/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ cd ../w/
4141
rm ../windows/unwad.zip
4242
zip -r ../windows/unwad.zip unwad/
4343

44-
cd ../.. ; rm -r release/l; rm -r release/w
44+
cd ../.. ; rm -r release/l; rm -r release/w

build/mingw-build.bat.example

Lines changed: 0 additions & 19 deletions
This file was deleted.

build/mingw-build.sh

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Thanks to MP2E for putting together this version of the build script =)
2+
3+
echo Preparing readme.txt...
4+
5+
g++ -O2 tools/filechars.cpp -o filechars.exe
6+
strip filechars.exe
7+
filechars.exe readme.txt
8+
cp readme.txt.h include/readme.txt.h
9+
10+
echo Compiling MiniZip
11+
12+
cd include/minizip
13+
gcc -c -DWIN32=1 -O2 -I./include -I.. minizip.c miniunz.c zip.c unzip.c iowin32.c ioapi.c
14+
cd ../..
15+
16+
echo Compiling UnWad
17+
18+
g++ -Wall -DMSW=1 -O2 -I./include -I./include/pngpp src/unwad.cpp include/qmus2mid/qmus2mid.cpp include/minizip/minizip.o include/minizip/ioapi.o include/minizip/iowin32.o include/minizip/zip.o include/minizip/unzip.o ./lib/libregex.dll.a ./lib/libmagic.dll.a ./lib/libpng.dll.a ./lib/libz.dll.a -o unwad.exe
19+
strip unwad.exe

build/test-build.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ cd ..
1010
./filechars *.txt
1111
rm filechars
1212

13-
cd src
14-
../build/linux-build.sh
13+
cd build
14+
./linux-build.sh
15+
mv ../src/unwad .
1516
cd ..
1617

1718
rm *.txt.h

release/linux/unwad.tar.gz

-1 Bytes
Binary file not shown.

release/windows/unwad.zip

0 Bytes
Binary file not shown.

src/unwad.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1263,7 +1263,6 @@ class Wad
12631263

12641264
for(unsigned i=0; i<head.lumpCount; i++)
12651265
{
1266-
12671266
// read lump data
12681267
if (lumps[i].info.size > 0)
12691268
{

tools/filechars.cpp

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,21 @@
11
// simple program to convert a text file to char*
22

3+
#include <cstdlib>
34
#include <vector>
4-
#include <string>
5+
#include <string.h>
56
#include <sstream>
67
#include <fstream>
78

9+
/*
10+
11+
#include <vector>
12+
#include <string.h>
13+
#include <sstream>
14+
#include <fstream>
15+
#include <cstdlib>
16+
17+
*/
18+
819
using namespace std;
920

1021
// escape special chars and add line breaks

0 commit comments

Comments
 (0)