X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d90d6ea7a007332aa75779f90b30ed39872e494..66c05fa96bc94b01c5e4c46f10991719bf4cbdf6:/contrib/build/foldbar/makefile.vc diff --git a/contrib/build/foldbar/makefile.vc b/contrib/build/foldbar/makefile.vc index 88874914ca..6fde8420ad 100644 --- a/contrib/build/foldbar/makefile.vc +++ b/contrib/build/foldbar/makefile.vc @@ -24,7 +24,7 @@ FOLDBARDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_9)$(__DEBUGRUNTIME) /DWIN32 \ $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - /I..\..\src\foldbar\..\..\..\include /I$(SETUPHDIR) /W4 \ + $(__MSLU_DEFINE_p) /I..\..\src\foldbar\..\..\..\include /I$(SETUPHDIR) /W4 \ /I..\..\src\foldbar\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_FOLDBAR \ $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ /Fp"$(OBJS)\wxprec_foldbardll.pch" $(CPPFLAGS) $(CXXFLAGS) @@ -40,7 +40,7 @@ FOLDBARLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_22)$(__DEBUGRUNTIME) /DWIN32 \ $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - /I..\..\src\foldbar\..\..\..\include /I$(SETUPHDIR) /W4 \ + $(__MSLU_DEFINE_p) /I..\..\src\foldbar\..\..\..\include /I$(SETUPHDIR) /W4 \ /I..\..\src\foldbar\..\..\include $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_foldbarlib.pch" $(CPPFLAGS) $(CXXFLAGS) FOLDBARLIB_OBJECTS = \ @@ -151,6 +151,9 @@ __THREAD_DEFINE_p_1 = /d wxNO_THREADS !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p_1 = /d _UNICODE !endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif !if "$(MONOLITHIC)" == "1" __WXLIB_MONO_p = \ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib @@ -272,6 +275,9 @@ __THREAD_DEFINE_p = /DwxNO_THREADS !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /D_UNICODE !endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif all: $(OBJS) @@ -311,7 +317,7 @@ $(OBJS)\foldbardll_dummy.obj: ../../src/foldbar\..\..\..\src\msw\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(FOLDBARDLL_CXXFLAGS) /Ycwx/wxprec.h $** $(OBJS)\foldbardll_version.res: ../../src/foldbar\..\..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i ..\..\src\foldbar\..\..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_vc$(VENDORTAG) $** + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i ..\..\src\foldbar\..\..\..\include /i $(SETUPHDIR) /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_vc$(VENDORTAG) $** $(OBJS)\foldbardll_captionbar.obj: ../../src/foldbar\captionbar.cpp $(CXX) /c /nologo /TP /Fo$@ $(FOLDBARDLL_CXXFLAGS) $**