Permalink
Browse files

remove Release without /ALIGN build config

  • Loading branch information...
1 parent bff0c82 commit ec9a7dc99fde8e8cbb41bf5112928dbb6b19b918 @j4y j4y committed Sep 19, 2015
Showing with 29 additions and 99 deletions.
  1. +1 −37 ColorCop.dsp
  2. +28 −62 ColorCop.mak
View
@@ -19,7 +19,6 @@ CFG=ColorCop - Win32 Debug
!MESSAGE
!MESSAGE "ColorCop - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE "ColorCop - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE "ColorCop - Win32 Release without ALIGN" (based on "Win32 (x86) Application")
!MESSAGE
# Begin Project
@@ -54,7 +53,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
-# ADD LINK32 MSVCRT.LIB kernel32.lib user32.lib /nologo /subsystem:windows /machine:I386 /OPT:REF /ALIGN:4096
+# ADD LINK32 MSVCRT.LIB kernel32.lib user32.lib /nologo /subsystem:windows /machine:I386 /OPT:REF
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "ColorCop - Win32 Debug"
@@ -83,42 +82,12 @@ LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-!ELSEIF "$(CFG)" == "ColorCop - Win32 Release without ALIGN"
-
-# PROP BASE Use_MFC 6
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ColorCop___Win32_Release_without_ALIGN"
-# PROP BASE Intermediate_Dir "ColorCop___Win32_Release_without_ALIGN"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 6
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ColorCop___Win32_Release_without_ALIGN"
-# PROP Intermediate_Dir "ColorCop___Win32_Release_without_ALIGN"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W2 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /Fp"Release/ColorCop.pch" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MD /W2 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /FR /Fp"Release/ColorCop.pch" /Yu"stdafx.h" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD BASE RSC /l 0x409 /fo"Release/ColorCop.res" /d "NDEBUG" /d "_AFXDLL"
-# ADD RSC /l 0x409 /fo"Release/ColorCop.res" /d "NDEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo /o"Release/ColorCop.bsc"
-# ADD BSC32 /nologo /o"Release/ColorCop.bsc"
-LINK32=link.exe
-# ADD BASE LINK32 MSVCRT.LIB kernel32.lib user32.lib /nologo /subsystem:windows /machine:I386 /out:"Release/ColorCop.exe" /OPT:REF
-# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 MSVCRT.LIB kernel32.lib user32.lib /nologo /subsystem:windows /machine:I386 /out:"Release/ColorCop.exe" /OPT:REF
-# SUBTRACT LINK32 /pdb:none
-
!ENDIF
# Begin Target
# Name "ColorCop - Win32 Release"
# Name "ColorCop - Win32 Debug"
-# Name "ColorCop - Win32 Release without ALIGN"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -132,11 +101,6 @@ SOURCE=.\ColorCop.cpp
!ELSEIF "$(CFG)" == "ColorCop - Win32 Debug"
-!ELSEIF "$(CFG)" == "ColorCop - Win32 Release without ALIGN"
-
-# ADD BASE CPP /O2
-# ADD CPP /O2
-
!ENDIF
# End Source File
View
@@ -25,6 +25,10 @@ NULL=
NULL=nul
!ENDIF
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "ColorCop - Win32 Release"
OUTDIR=.\Release
@@ -58,42 +62,8 @@ CLEAN :
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
CPP_PROJ=/nologo /MD /W2 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\ColorCop.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-MTL=midl.exe
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
-RSC=rc.exe
RSC_PROJ=/l 0x409 /fo"$(INTDIR)\ColorCop.res" /d "NDEBUG" /d "_AFXDLL"
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\ColorCop.bsc"
@@ -111,7 +81,7 @@ BSC32_SBRS= \
<<
LINK32=link.exe
-LINK32_FLAGS=MSVCRT.LIB kernel32.lib user32.lib /nologo /subsystem:windows /incremental:no /pdb:"$(OUTDIR)\ColorCop.pdb" /machine:I386 /out:"$(OUTDIR)\ColorCop.exe" /OPT:REF /ALIGN:4096
+LINK32_FLAGS=MSVCRT.LIB kernel32.lib user32.lib /nologo /subsystem:windows /incremental:no /pdb:"$(OUTDIR)\ColorCop.pdb" /machine:I386 /out:"$(OUTDIR)\ColorCop.exe" /OPT:REF
LINK32_OBJS= \
"$(INTDIR)\ColorCop.obj" \
"$(INTDIR)\ColorCopDlg.obj" \
@@ -154,8 +124,30 @@ CLEAN :
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
CPP_PROJ=/nologo /MDd /W3 /GX /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Fp"$(INTDIR)\ColorCop.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\ColorCop.res" /d "_DEBUG" /d "_AFXDLL"
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\ColorCop.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=/nologo /subsystem:windows /incremental:yes /pdb:"$(OUTDIR)\ColorCop.pdb" /debug /machine:I386 /out:"$(OUTDIR)\ColorCop.exe" /pdbtype:sept
+LINK32_OBJS= \
+ "$(INTDIR)\ColorCop.obj" \
+ "$(INTDIR)\ColorCopDlg.obj" \
+ "$(INTDIR)\colorspace.obj" \
+ "$(INTDIR)\Label.obj" \
+ "$(INTDIR)\StdAfx.obj" \
+ "$(INTDIR)\SystemTray.obj" \
+ "$(INTDIR)\ColorCop.res"
+
+"$(OUTDIR)\ColorCop.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -187,32 +179,6 @@ CPP_PROJ=/nologo /MDd /W3 /GX /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXD
$(CPP_PROJ) $<
<<
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\ColorCop.res" /d "_DEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ColorCop.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=/nologo /subsystem:windows /incremental:yes /pdb:"$(OUTDIR)\ColorCop.pdb" /debug /machine:I386 /out:"$(OUTDIR)\ColorCop.exe" /pdbtype:sept
-LINK32_OBJS= \
- "$(INTDIR)\ColorCop.obj" \
- "$(INTDIR)\ColorCopDlg.obj" \
- "$(INTDIR)\colorspace.obj" \
- "$(INTDIR)\Label.obj" \
- "$(INTDIR)\StdAfx.obj" \
- "$(INTDIR)\SystemTray.obj" \
- "$(INTDIR)\ColorCop.res"
-
-"$(OUTDIR)\ColorCop.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF
-
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("ColorCop.dep")

0 comments on commit ec9a7dc

Please sign in to comment.