include compiler name in plugin DLL name on Windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -35,7 +35,7 @@ RENDER_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
|
||||
$(__OPTIMIZEFLAG) -tWM -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) $(CXXFLAGS)
|
||||
-I.\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS)
|
||||
RENDER_OBJECTS = \
|
||||
$(OBJS)\render_render.obj
|
||||
|
||||
@@ -125,6 +125,9 @@ __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
|
||||
!if "$(UNICODE)" == "1"
|
||||
__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
|
||||
!endif
|
||||
!if "$(MSLU)" == "1"
|
||||
__UNICOWS_LIB_p = unicows.lib
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "0"
|
||||
__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
|
||||
!endif
|
||||
@@ -144,11 +147,9 @@ __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
|
||||
!endif
|
||||
!if "$(SHARED)" == "1"
|
||||
__renddll___depname = \
|
||||
$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)250.dll
|
||||
$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)250_bcc.dll
|
||||
!endif
|
||||
|
||||
MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DWXUNIV=$(WXUNIV)
|
||||
|
||||
|
||||
all: $(OBJS)
|
||||
$(OBJS):
|
||||
@@ -165,22 +166,22 @@ $(OBJS)\render_render.obj: .\render.cpp
|
||||
$(CXX) -q -c -P -o$@ $(RENDER_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\render_sample.res: .\..\..\samples\sample.rc
|
||||
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -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_1) $**
|
||||
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -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_1) -i.\..\..\samples $**
|
||||
|
||||
clean:
|
||||
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
|
||||
-if exist $(OBJS)\*.res del $(OBJS)\*.res
|
||||
-if exist $(OBJS)\render.exe del $(OBJS)\render.exe
|
||||
-if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)250.dll del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)250.dll
|
||||
-if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)250_bcc.dll del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)250_bcc.dll
|
||||
|
||||
!if "$(SHARED)" == "1"
|
||||
$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)250.dll: $(RENDDLL_OBJECTS)
|
||||
$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)250_bcc.dll: $(RENDDLL_OBJECTS)
|
||||
ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
|
||||
c0d32.obj $(RENDDLL_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib import32.lib cw32mt$(__RUNTIME_LIBS_0).lib,,
|
||||
c0d32.obj $(RENDDLL_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__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) import32.lib ole2w32.lib import32.lib cw32mt$(__RUNTIME_LIBS_0).lib,,
|
||||
|
|
||||
!endif
|
||||
|
||||
$(OBJS)\render.exe: $(RENDER_OBJECTS) $(OBJS)\render_sample.res
|
||||
ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
|
||||
c0w32.obj $(RENDER_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_0).lib,, $(OBJS)\render_sample.res
|
||||
ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
|
||||
c0w32.obj $(RENDER_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__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) import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_0).lib,, $(OBJS)\render_sample.res
|
||||
|
|
||||
|
Reference in New Issue
Block a user