8000 Merge pull request #2 from ljbade/master · coderforlife/pe-file@86c96e2 · GitHub
[go: up one dir, main page]
Skip to content

Commit 86c96e2

Browse files
coderforlifecoderforlife
committed
Merge pull request #2 from ljbade/master
Fix for building in Visual C++ 2010
2 parents 2049c71 + 1d1abba commit 86c96e2

6 files changed

+47
-4
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@
1111
*.lai
1212
*.la
1313
*.a
14+
15+
# Compiled Symbol files
16+
*.pdb

‎PEFile.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ void* File::GetResourceDirect(void* _data, const_resid type, const_resid name) {
108108
const DOSHeader *dosh = (DOSHeader*)data;
109109
if (dosh->e_magic != DOSHeader::SIGNATURE) { return NULL; }
110110
int32_t peOffset = dosh->e_lfanew;
111-
const NTHeaders32 *nth = (NTHeaders*)(data+peOffset);
111+
const NTHeaders32 *nth = (NTHeaders32*)(data+peOffset);
112112
if (nth->Signature != NTHeaders::SIGNATURE) { return NULL; }
113113
const FileHeader* header = &nth->FileHeader; // identical for 32 and 64 bits
114114
const OptionalHeader* opt = &nth->OptionalHeader;

‎build-msvc10-debug.bat

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
@echo off
2+
3+
:: This builds using MSVC VS100 (.NET 4.0)
4+
5+
set FLAGS=/nologo /MDd /D _DEBUG /Zi /W4 /wd4201 /wd4480 /O2 /GS /EHa /D _UNICODE /D UNICODE
6+
set FILES=PEFile.cpp PEFileResources.cpp PEDataSource.cpp PEVersion.cpp
7+
8+
echo Compiling 32-bit...
9+
call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x86
10+
cl %FLAGS% /FdPEFile_d.pdb /c %FILES%
11+
lib /nologo /out:PEFile_d.lib *.obj
12+
del /F /Q *.obj >NUL 2>&1
13+
echo.
14+
15+
echo Compiling 64-bit...
16+
call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x64
17+
cl %FLAGS% /FdPEFile64_d.pdb /c %FILES%
18+
lib /nologo /out:PEFile64_d.lib *.obj
19+
del /F /Q *.obj >NUL 2>&1
20+
pause

‎build-msvc10.bat

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
@echo off
2+
3+
:: This builds using MSVC VS100 (.NET 4.0)
4+
5+
set FLAGS=/nologo /MD /D NDEBUG /W4 /wd4201 /wd4480 /O2 /GS /GL /EHa /D _UNICODE /D UNICODE
6+
set FILES=PEFile.cpp PEFileResources.cpp PEDataSource.cpp PEVersion.cpp
7+
8+
echo Compiling 32-bit...
9+
call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x86
10+
cl %FLAGS% /c %FILES%
11+
lib /nologo /ltcg /out:PEFile.lib *.obj
12+
del /F /Q *.obj >NUL 2>&1
13+
echo.
14+
15+
echo Compiling 64-bit...
16+
call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x64
17+
cl %FLAGS% /c %FILES%
18+
lib /nologo /ltcg /out:PEFile64.lib *.obj
19+
del /F /Q *.obj >NUL 2>&1
20+
pause

‎build-msvc-debug.bat renamed to ‎build-msvc9-debug.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22

33
:: This builds using MSVC VS90 (.NET 2.0)
44

5-
set FLAGS=/nologo /MDd /D _DEBUG /Zi /W4 /wd4201 /wd4480 /O2 /GS /GL /EHa /D _UNICODE /D UNICODE
5+
set FLAGS=/nologo /MDd /D _DEBUG /Zi /W4 /wd4201 /wd4480 /O2 /GS /EHa /D _UNICODE /D UNICODE
66
set FILES=PEFile.cpp PEFileResources.cpp PEDataSource.cpp PEVersion.cpp
77

88
echo Compiling 32-bit...
99
call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86
1010
cl %FLAGS% /FdPEFile_d.pdb /c %FILES%
11-
lib /nologo /ltcg /out:PEFile_d.lib *.obj
11+
lib /nologo /out:PEFile_d.lib *.obj
1212
del /F /Q *.obj >NUL 2>&1
1313
echo.
1414

1515
echo Compiling 64-bit...
1616
call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x64
1717
cl %FLAGS% /FdPEFile64_d.pdb /c %FILES%
18-
lib /nologo /ltcg /out:PEFile64_d.lib *.obj
18+
lib /nologo /out:PEFile64_d.lib *.obj
1919
del /F /Q *.obj >NUL 2>&1
2020
pause

‎build-msvc.bat renamed to ‎build-msvc9.bat

File renamed without changes.

0 commit comments

Comments
 (0)
0