Anonymous avatar Anonymous committed 77766d6

masterfix: #i10000# no 64-bit debug libs to link

Comments (0)

Files changed (1)

extensions/source/activex/main/makefile.mk

 .IF "$(PRODUCT)"!=""
 RC+=-DPRODUCT
 .ENDIF
-.IF "$(USE_STLP_DEBUG)"!=""
-CDEFS+=-D_DEBUG
-.ENDIF # "$(USE_STLP_DEBUG)"!=""
 
 RCFILES=\
         $(TARGET).rc
 
 .IF "$(COM)"!="GCC"
 .IF "$(CCNUMVER)" > "001300000000"
-.IF "$(USE_STLP_DEBUG)" != ""
-    SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib
-.ELSE
     SHL1STDLIBS+= $(ATL_LIB)$/atls.lib
 .ENDIF
 .ENDIF
-.ENDIF
 
 
 #    $(KERNEL32LIB) \
 
 .IF "$(BUILD_X64)"!=""
 # -------------------- x64 -----------------------
-.IF "$(USE_STLP_DEBUG)"!=""
-CDEFS_X64+=-D_DEBUG
-.ENDIF # "$(USE_STLP_DEBUG)"!=""
 
 CDEFS_X64+:=$(foreach,i,$(CDEFS) $(subst,-D_X86_=1,  $i))
 LIBTARGET_X64=NO
 SHL1OBJS_X64=$(SLOFILES_X64)
 SHL1DEF_X64=$(TARGET).def
 
-.IF "$(USE_STLP_DEBUG)" != ""
-    SHL1STDLIBS_X64+= $(ATL_LIB)$/amd64$/atlsd.lib
-.ELSE
-    SHL1STDLIBS_X64+= $(ATL_LIB)$/amd64$/atls.lib
-.ENDIF
+SHL1STDLIBS_X64+= $(ATL_LIB)$/amd64$/atls.lib
 
 .ENDIF # "$(BUILD_X64)"!=""
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.