aboutsummaryrefslogtreecommitdiff
path: root/CPP/7zip/Bundles/Fm
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--CPP/7zip/Bundles/Fm/FM.dsp29
-rw-r--r--CPP/7zip/Bundles/Fm/StdAfx.h18
-rw-r--r--CPP/7zip/Bundles/Fm/makefile3
3 files changed, 32 insertions, 18 deletions
diff --git a/CPP/7zip/Bundles/Fm/FM.dsp b/CPP/7zip/Bundles/Fm/FM.dsp
index 54efba9..402dd2c 100644
--- a/CPP/7zip/Bundles/Fm/FM.dsp
+++ b/CPP/7zip/Bundles/Fm/FM.dsp
@@ -45,7 +45,7 @@ RSC=rc.exe
45# PROP Ignore_Export_Lib 0 45# PROP Ignore_Export_Lib 0
46# PROP Target_Dir "" 46# PROP Target_Dir ""
47# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c 47# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
48# ADD CPP /nologo /Gz /MD /W4 /WX /GX /O1 /D "NDEBUG" /D "_MBCS" /D "WIN32" /D "_WINDOWS" /D "LANG" /D "WIN_LONG_PATH" /D "NEW_FOLDER_INTERFACE" /D "EXTERNAL_CODECS_2" /D "SUPPORT_DEVICE_FILE" /Yu"StdAfx.h" /FD /c 48# ADD CPP /nologo /Gz /MD /W4 /WX /GX /O1 /D "NDEBUG" /D "_MBCS" /D "WIN32" /D "_WINDOWS" /D "Z7_LANG" /D "Z7_LONG_PATH" /D "Z7_EXTERNAL_CODECS_2" /D "Z7_DEVICE_FILE" /Yu"StdAfx.h" /FD /c
49# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 49# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
50# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 50# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
51# ADD BASE RSC /l 0x419 /d "NDEBUG" 51# ADD BASE RSC /l 0x419 /d "NDEBUG"
@@ -72,7 +72,7 @@ LINK32=link.exe
72# PROP Ignore_Export_Lib 0 72# PROP Ignore_Export_Lib 0
73# PROP Target_Dir "" 73# PROP Target_Dir ""
74# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c 74# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
75# ADD CPP /nologo /Gz /MDd /W4 /WX /Gm /GX /ZI /Od /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_WINDOWS" /D "LANG" /D "WIN_LONG_PATH" /D "NEW_FOLDER_INTERFACE" /D "EXTERNAL_CODECS_2" /D "SUPPORT_DEVICE_FILE" /Yu"StdAfx.h" /FD /GZ /c 75# ADD CPP /nologo /Gz /MDd /W4 /WX /Gm /GX /ZI /Od /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_WINDOWS" /D "Z7_LANG" /D "Z7_LONG_PATH" /D "Z7_EXTERNAL_CODECS_2" /D "Z7_DEVICE_FILE" /Yu"StdAfx.h" /FD /GZ /c
76# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 76# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
77# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 77# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
78# ADD BASE RSC /l 0x419 /d "_DEBUG" 78# ADD BASE RSC /l 0x419 /d "_DEBUG"
@@ -99,7 +99,7 @@ LINK32=link.exe
99# PROP Ignore_Export_Lib 0 99# PROP Ignore_Export_Lib 0
100# PROP Target_Dir "" 100# PROP Target_Dir ""
101# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"StdAfx.h" /FD /c 101# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"StdAfx.h" /FD /c
102# ADD CPP /nologo /Gz /MD /W4 /WX /GX /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "LANG" /D "WIN_LONG_PATH" /D "NEW_FOLDER_INTERFACE" /D "EXTERNAL_CODECS_2" /D "SUPPORT_DEVICE_FILE" /Yu"StdAfx.h" /FD /c 102# ADD CPP /nologo /Gz /MD /W4 /WX /GX /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "Z7_LANG" /D "Z7_LONG_PATH" /D "Z7_EXTERNAL_CODECS_2" /D "Z7_DEVICE_FILE" /Yu"StdAfx.h" /FD /c
103# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 103# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
104# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 104# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
105# ADD BASE RSC /l 0x419 /d "NDEBUG" 105# ADD BASE RSC /l 0x419 /d "NDEBUG"
@@ -127,7 +127,7 @@ LINK32=link.exe
127# PROP Ignore_Export_Lib 0 127# PROP Ignore_Export_Lib 0
128# PROP Target_Dir "" 128# PROP Target_Dir ""
129# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"StdAfx.h" /FD /GZ /c 129# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"StdAfx.h" /FD /GZ /c
130# ADD CPP /nologo /Gz /MDd /W4 /WX /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "LANG" /D "WIN_LONG_PATH" /D "NEW_FOLDER_INTERFACE" /D "EXTERNAL_CODECS_2" /D "SUPPORT_DEVICE_FILE" /Yu"StdAfx.h" /FD /GZ /c 130# ADD CPP /nologo /Gz /MDd /W4 /WX /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "Z7_LANG" /D "Z7_LONG_PATH" /D "Z7_EXTERNAL_CODECS_2" /D "Z7_DEVICE_FILE" /Yu"StdAfx.h" /FD /GZ /c
131# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 131# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
132# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 132# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
133# ADD BASE RSC /l 0x419 /d "_DEBUG" 133# ADD BASE RSC /l 0x419 /d "_DEBUG"
@@ -849,6 +849,14 @@ SOURCE=..\..\Common\MethodProps.h
849# End Source File 849# End Source File
850# Begin Source File 850# Begin Source File
851 851
852SOURCE=..\..\Common\MultiOutStream.cpp
853# End Source File
854# Begin Source File
855
856SOURCE=..\..\Common\MultiOutStream.h
857# End Source File
858# Begin Source File
859
852SOURCE=..\..\Common\OutBuffer.cpp 860SOURCE=..\..\Common\OutBuffer.cpp
853# End Source File 861# End Source File
854# Begin Source File 862# Begin Source File
@@ -947,10 +955,19 @@ SOURCE=..\..\..\..\C\7zCrcOpt.c
947# End Source File 955# End Source File
948# Begin Source File 956# Begin Source File
949 957
958SOURCE=..\..\..\..\C\7zStream.c
959# SUBTRACT CPP /YX /Yc /Yu
960# End Source File
961# Begin Source File
962
950SOURCE=..\..\..\..\C\7zTypes.h 963SOURCE=..\..\..\..\C\7zTypes.h
951# End Source File 964# End Source File
952# Begin Source File 965# Begin Source File
953 966
967SOURCE=..\..\..\..\C\7zWindows.h
968# End Source File
969# Begin Source File
970
954SOURCE=..\..\..\..\C\Alloc.c 971SOURCE=..\..\..\..\C\Alloc.c
955# SUBTRACT CPP /YX /Yc /Yu 972# SUBTRACT CPP /YX /Yc /Yu
956# End Source File 973# End Source File
@@ -960,6 +977,10 @@ SOURCE=..\..\..\..\C\Alloc.h
960# End Source File 977# End Source File
961# Begin Source File 978# Begin Source File
962 979
980SOURCE=..\..\..\..\C\Compiler.h
981# End Source File
982# Begin Source File
983
963SOURCE=..\..\..\..\C\CpuArch.c 984SOURCE=..\..\..\..\C\CpuArch.c
964 985
965!IF "$(CFG)" == "FM - Win32 Release" 986!IF "$(CFG)" == "FM - Win32 Release"
diff --git a/CPP/7zip/Bundles/Fm/StdAfx.h b/CPP/7zip/Bundles/Fm/StdAfx.h
index 15fd136..4f27255 100644
--- a/CPP/7zip/Bundles/Fm/StdAfx.h
+++ b/CPP/7zip/Bundles/Fm/StdAfx.h
@@ -1,16 +1,6 @@
1// stdafx.h 1// StdAfx.h
2
3#ifndef __STDAFX_H
4#define __STDAFX_H
5
6// #define _WIN32_WINNT 0x0400
7#define _WIN32_WINNT 0x0500
8#define WINVER _WIN32_WINNT
9
10#include "../../../Common/Common.h"
11
12#include <CommCtrl.h>
13#include <ShlObj.h>
14#include <Shlwapi.h>
15 2
3#if _MSC_VER >= 1800
4#pragma warning(disable : 4464) // relative include path contains '..'
16#endif 5#endif
6#include "../../UI/FileManager/StdAfx.h"
diff --git a/CPP/7zip/Bundles/Fm/makefile b/CPP/7zip/Bundles/Fm/makefile
index 33813e8..33b5320 100644
--- a/CPP/7zip/Bundles/Fm/makefile
+++ b/CPP/7zip/Bundles/Fm/makefile
@@ -1,5 +1,7 @@
1PROG = 7zFM.exe 1PROG = 7zFM.exe
2 2
3CFLAGS = $(CFLAGS) -DZ7_LARGE_PAGES
4
3!include "../Format7zF/Arc.mak" 5!include "../Format7zF/Arc.mak"
4 6
5!include "../../UI/FileManager/FM.mak" 7!include "../../UI/FileManager/FM.mak"
@@ -36,6 +38,7 @@ WIN_CTRL_OBJS = \
367ZIP_COMMON_OBJS = $(7ZIP_COMMON_OBJS) \ 387ZIP_COMMON_OBJS = $(7ZIP_COMMON_OBJS) \
37 $O\FilePathAutoRename.obj \ 39 $O\FilePathAutoRename.obj \
38 $O\FileStreams.obj \ 40 $O\FileStreams.obj \
41 $O\MultiOutStream.obj \
39 42
40UI_COMMON_OBJS = \ 43UI_COMMON_OBJS = \
41 $O\ArchiveExtractCallback.obj \ 44 $O\ArchiveExtractCallback.obj \
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-06 01:24:07 +0000