diff --git a/lib/win32/bindevt/bindevt.mak b/lib/win32/bindevt/bindevt.mak index ac708c5262..8aa0124651 100644 --- a/lib/win32/bindevt/bindevt.mak +++ b/lib/win32/bindevt/bindevt.mak @@ -34,33 +34,30 @@ RSC=rc.exe OUTDIR=.\Release INTDIR=.\Release -ALL : "..\bin\Release\bindevt.dll" +ALL : "..\..\..\Build\Release\bindevt.dll" CLEAN : -@erase "$(INTDIR)\bindevt.obj" - -@erase "$(INTDIR)\bindevt.res" -@erase "$(INTDIR)\vc60.idb" -@erase "$(OUTDIR)\bindevt.exp" - -@erase "..\bin\Release\bindevt.dll" + -@erase "..\..\..\Build\Release\bindevt.dll" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" 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 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\bindevt.res" /d "NDEBUG" BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\bindevt.bsc" 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:"..\bin\Release\bindevt.dll" /implib:"$(OUTDIR)\bindevt.lib" +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.res" + "$(INTDIR)\bindevt.obj" -"..\bin\Release\bindevt.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) +"..\..\..\Build\Release\bindevt.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< $(LINK32_FLAGS) $(LINK32_OBJS) << @@ -73,25 +70,25 @@ INTDIR=.\Debug OutDir=.\Debug # End Custom Macros -ALL : "..\bin\Debug\bindevt.dll" "$(OUTDIR)\bindevt.bsc" +ALL : ".\bindevt.rc" "..\..\..\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 "..\bin\Debug\bindevt.dll" + -@erase "$(OUTDIR)\bindevt.lib" + -@erase "..\..\..\Build\Debug\bindevt.dll" + -@erase "bindevt.rc" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" 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= \ @@ -103,12 +100,11 @@ 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:"..\bin\Debug\bindevt.dll" /implib:"$(OUTDIR)\bindevt.lib" +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" + "$(INTDIR)\bindevt.obj" -"..\bin\Debug\bindevt.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) +"..\..\..\Build\Debug\bindevt.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< $(LINK32_FLAGS) $(LINK32_OBJS) << @@ -172,11 +168,24 @@ SOURCE=.\bindevt.c !ENDIF -SOURCE=.\bindevt.rc +SOURCE=.\bindevt.mc -"$(INTDIR)\bindevt.res" : $(SOURCE) "$(INTDIR)" - $(RSC) $(RSC_PROJ) $(SOURCE) +!IF "$(CFG)" == "bindevt - Win32 Release" +!ELSEIF "$(CFG)" == "bindevt - Win32 Debug" + +TargetName=bindevt +InputPath=.\bindevt.mc +InputName=bindevt + +".\bindevt.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + <