Tweak makefiles

Author: ozone10

CPP/7zip/7zip.mak

@@ -28,13 +28,16 @@ OBJS = \
   $(CRYPTO_OBJS) \
   $(C_OBJS) \
   $(ASM_OBJS) \
-  $(DARK_MODE_OBJS) \
   $O\resource.res \
 
+!include "../../../../DarkMode/7zRes/7zDarkObj.mak"
+
 !include "../../../Build.mak"
 
 # MAK_SINGLE_FILE = 1
 
+!include "../../../../DarkMode/7zRes/7zDark.mak"
+
 !IFDEF MAK_SINGLE_FILE
 
 !IFDEF CURRENT_OBJS
@@ -168,11 +171,6 @@ $(GUI_OBJS): ../../UI/GUI/$(*B).cpp
 	$(COMPL)
 !ENDIF
 
-!IFDEF DARK_MODE_OBJS
-$(DARK_MODE_OBJS): ../../../../DarkMode/src/$(*B).cpp
-	$(COMPL)
-!ENDIF
-
 !IFDEF C_OBJS
 $(C_OBJS): ../../../../C/$(*B).c
 	$(COMPL_O2)
@@ -241,9 +239,6 @@ $(C_OBJS): ../../../../C/$(*B).c
 {../../../../C}.c{$O}.obj::
 	$(CCOMPLB)
 
-{../../../../DarkMode/src}.cpp{$O}.obj::
-	$(COMPLB)
-
 !ENDIF
 
 !include "Asm.mak"

CPP/7zip/Bundles/Fm/makefile

@@ -35,10 +35,6 @@ WIN_CTRL_OBJS = \
   $O\PropertyPage.obj \
   $O\Window2.obj \
 
-DARK_MODE_OBJS = \
-  $O\DarkMode.obj \
-  $O\DarkModeSubclass.obj \
-
 7ZIP_COMMON_OBJS = $(7ZIP_COMMON_OBJS) \
   $O\FilePathAutoRename.obj \
   $O\FileStreams.obj \

CPP/7zip/Bundles/SFXSetup/makefile

@@ -44,10 +44,6 @@ WIN_OBJS = \
 WIN_CTRL_OBJS = \
   $O\Dialog.obj \
 
-DARK_MODE_OBJS = \
-  $O\DarkMode.obj \
-  $O\DarkModeSubclass.obj \
-
 7ZIP_COMMON_OBJS = \
   $O\CreateCoder.obj \
   $O\CWrappers.obj \

CPP/7zip/Bundles/SFXWin/makefile

@@ -56,10 +56,6 @@ WIN_CTRL_OBJS = \
   $O\Dialog.obj \
   $O\ListView.obj \
 
-DARK_MODE_OBJS = \
-  $O\DarkMode.obj \
-  $O\DarkModeSubclass.obj \
-
 7ZIP_COMMON_OBJS = \
   $O\CreateCoder.obj \
   $O\CWrappers.obj \

CPP/7zip/UI/Explorer/makefile

@@ -56,10 +56,6 @@ WIN_CTRL_OBJS = \
   $O\Dialog.obj \
   $O\ListView.obj \
 
-DARK_MODE_OBJS = \
-  $O\DarkMode.obj \
-  $O\DarkModeSubclass.obj \
-
 UI_COMMON_OBJS = \
   $O\ArchiveName.obj \
   $O\CompressCall.obj \

CPP/7zip/UI/FileManager/makefile

@@ -51,10 +51,6 @@ WIN_CTRL_OBJS = \
   $O\PropertyPage.obj \
   $O\Window2.obj \
 
-DARK_MODE_OBJS = \
-  $O\DarkMode.obj \
-  $O\DarkModeSubclass.obj \
-
 7ZIP_COMMON_OBJS = \
   $O\CreateCoder.obj \
   $O\FilePathAutoRename.obj \

CPP/7zip/UI/GUI/makefile

@@ -66,10 +66,6 @@ WIN_CTRL_OBJS = \
   $O\Dialog.obj \
   $O\ListView.obj \
 
-DARK_MODE_OBJS = \
-  $O\DarkMode.obj \
-  $O\DarkModeSubclass.obj \
-
 7ZIP_COMMON_OBJS = \
   $O\CreateCoder.obj \
   $O\FilePathAutoRename.obj \

DarkMode/7zRes/7zDark.mak

@@ -0,0 +1,13 @@
+!IFDEF MAK_SINGLE_FILE
+
+!IFDEF DARK_MODE_OBJS
+$(DARK_MODE_OBJS): ../../../../DarkMode/src/$(*B).cpp
+	$(COMPL)
+!ENDIF
+
+!ELSE
+
+{../../../../DarkMode/src}.cpp{$O}.obj::
+	$(COMPLB)
+
+!ENDIF

DarkMode/7zRes/7zDarkObj.mak

@@ -0,0 +1,9 @@
+!IFDEF WIN_CTRL_OBJS
+DARK_MODE_OBJS = \
+  $O\DarkMode.obj \
+  $O\DarkModeSubclass.obj \
+!ENDIF
+
+OBJS = \
+  $(OBJS) \
+  $(DARK_MODE_OBJS) \