diff --git a/lib/win32/bindevt/bindevt.dsp b/lib/win32/bindevt/bindevt.dsp index 5e129aacac..520e666146 100644 --- a/lib/win32/bindevt/bindevt.dsp +++ b/lib/win32/bindevt/bindevt.dsp @@ -113,6 +113,10 @@ InputName=bindevt !ENDIF +# End Source File +# Begin Source File + +SOURCE=.\bindevt.rc # End Source File # End Target # End Project diff --git a/lib/win32/bindevt/bindevt.mak b/lib/win32/bindevt/bindevt.mak index 26a554d03c..da87681fbb 100644 --- a/lib/win32/bindevt/bindevt.mak +++ b/lib/win32/bindevt/bindevt.mak @@ -25,6 +25,10 @@ NULL= NULL=nul !ENDIF +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + !IF "$(CFG)" == "bindevt - Win32 Release" OUTDIR=.\Release @@ -35,6 +39,7 @@ ALL : "..\..\..\Build\Release\bindevt.dll" CLEAN : -@erase "$(INTDIR)\bindevt.obj" + -@erase "$(INTDIR)\bindevt.res" -@erase "$(INTDIR)\vc60.idb" -@erase "$(OUTDIR)\bindevt.exp" -@erase "..\..\..\Build\Release\bindevt.dll" @@ -42,42 +47,9 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP=cl.exe CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "..\include" /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /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 /win32 -RSC=rc.exe +RSC_PROJ=/l 0x409 /fo"$(INTDIR)\bindevt.res" /d "NDEBUG" BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\bindevt.bsc" BSC32_SBRS= \ @@ -85,7 +57,8 @@ BSC32_SBRS= \ LINK32=link.exe LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"..\..\..\Build\Release\bindevt.dll" /implib:"$(OUTDIR)\bindevt.lib" LINK32_OBJS= \ - "$(INTDIR)\bindevt.obj" + "$(INTDIR)\bindevt.obj" \ + "$(INTDIR)\bindevt.res" "..\..\..\Build\Release\bindevt.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< @@ -100,24 +73,47 @@ INTDIR=.\Debug OutDir=.\Debug # End Custom Macros -ALL : ".\bindevt.rc" "..\..\..\Build\Debug\bindevt.dll" "$(OUTDIR)\bindevt.bsc" +ALL : "..\..\..\Build\Debug\bindevt.dll" "$(OUTDIR)\bindevt.bsc" CLEAN : -@erase "$(INTDIR)\bindevt.obj" + -@erase "$(INTDIR)\bindevt.res" -@erase "$(INTDIR)\bindevt.sbr" -@erase "$(INTDIR)\vc60.idb" -@erase "$(INTDIR)\vc60.pdb" -@erase "$(OUTDIR)\bindevt.bsc" -@erase "$(OUTDIR)\bindevt.exp" -@erase "..\..\..\Build\Debug\bindevt.dll" - -@erase "bindevt.rc" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP=cl.exe CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BINDEVT_EXPORTS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC_PROJ=/l 0x409 /fo"$(INTDIR)\bindevt.res" /d "_DEBUG" +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\bindevt.bsc" +BSC32_SBRS= \ + "$(INTDIR)\bindevt.sbr" + +"$(OUTDIR)\bindevt.bsc" : "$(OUTDIR)" $(BSC32_SBRS) + $(BSC32) @<< + $(BSC32_FLAGS) $(BSC32_SBRS) +<< + +LINK32=link.exe +LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /debug /machine:I386 /out:"..\..\..\Build\Debug\bindevt.dll" /implib:"$(OUTDIR)\bindevt.lib" +LINK32_OBJS= \ + "$(INTDIR)\bindevt.obj" \ + "$(INTDIR)\bindevt.res" + +"..\..\..\Build\Debug\bindevt.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF .c{$(INTDIR)}.obj:: $(CPP) @<< @@ -149,31 +145,6 @@ CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\..\include" $(CPP_PROJ) $< << -MTL=midl.exe -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\bindevt.bsc" -BSC32_SBRS= \ - "$(INTDIR)\bindevt.sbr" - -"$(OUTDIR)\bindevt.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /debug /machine:I386 /out:"..\..\..\Build\Debug\bindevt.dll" /implib:"$(OUTDIR)\bindevt.lib" -LINK32_OBJS= \ - "$(INTDIR)\bindevt.obj" - -"..\..\..\Build\Debug\bindevt.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - !IF "$(NO_EXTERNAL_DEPS)" != "1" !IF EXISTS("bindevt.dep") @@ -220,6 +191,12 @@ InputName=bindevt !ENDIF +SOURCE=.\bindevt.rc + +"$(INTDIR)\bindevt.res" : $(SOURCE) "$(INTDIR)" + $(RSC) $(RSC_PROJ) $(SOURCE) + + !ENDIF