X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ace007846cb47a8851354318be733b7f4918e30..d841895246c188d722bae08e9f37c7270bc56ea8:/utils/HelpGen/makefile.vc

diff --git a/utils/HelpGen/makefile.vc b/utils/HelpGen/makefile.vc
index c0f5703aec..5f801f0621 100644
--- a/utils/HelpGen/makefile.vc
+++ b/utils/HelpGen/makefile.vc
@@ -15,9 +15,8 @@
 HELPGEN_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \
 	/DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\HelpGen.pdb $(____DEBUGRUNTIME_2_p) \
 	$(__OPTIMIZEFLAG_4) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) /I.\..\..\include /I$(LIBDIRNAME) /I.\..\..\src\tiff \
-	/I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex \
-	/I.\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_CONSOLE $(CXXFLAGS)
+	$(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) \
+	/D_CONSOLE $(CXXFLAGS) /GR /GX
 HELPGEN_OBJECTS =  \
 	$(OBJS)\HelpGen_HelpGen.obj \
 	$(OBJS)\HelpGen_cjparser.obj \
@@ -26,15 +25,20 @@ HELPGEN_OBJECTS =  \
 	$(OBJS)\HelpGen_markup.obj \
 	$(OBJS)\HelpGen_scriptbinder.obj \
 	$(OBJS)\HelpGen_sourcepainter.obj \
-	$(OBJS)\HelpGen_srcparser.obj \
-	$(OBJS)\HelpGen_wx_extra_imps.obj
-LIBDIRNAME = \
-	.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+	$(OBJS)\HelpGen_srcparser.obj
 OBJS = \
 	vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+SETUPHDIR = \
+	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 
 ### Conditionally set variables: ###
 
+!if "$(SHARED)" == "0"
+LIBDIRNAME = .\..\..\lib\vc_lib$(CFG)
+!endif
+!if "$(SHARED)" == "1"
+LIBDIRNAME = .\..\..\lib\vc_dll$(CFG)
+!endif
 !if "$(USE_GUI)" == "0"
 PORTNAME = base
 !endif
@@ -132,7 +136,7 @@ __RUNTIME_LIBS_7 = D
 __RUNTIME_LIBS_7 = T
 !endif
 !if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = /D_UNICODE
 !endif
 !if "$(MSLU)" == "1"
 __UNICOWS_LIB_p = unicows.lib
@@ -202,15 +206,14 @@ $(OBJS)\HelpGen_sourcepainter.obj: .\src\sourcepainter.cpp
 $(OBJS)\HelpGen_srcparser.obj: .\src\srcparser.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(HELPGEN_CXXFLAGS) $**
 
-$(OBJS)\HelpGen_wx_extra_imps.obj: .\src\wx_extra_imps.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(HELPGEN_CXXFLAGS) $**
-
 $(OBJS)\HelpGen.exe: $(HELPGEN_OBJECTS)
 	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE @<<
-	$(HELPGEN_OBJECTS)  $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib
+	$(HELPGEN_OBJECTS)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib
 <<
 
 clean: 
 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 	-if exist $(OBJS)\*.res del $(OBJS)\*.res
 	-if exist $(OBJS)\HelpGen.exe del $(OBJS)\HelpGen.exe
+	-if exist $(OBJS)\HelpGen.ilk del $(OBJS)\HelpGen.ilk
+	-if exist $(OBJS)\HelpGen.pdb del $(OBJS)\HelpGen.pdb