From 2b75f580670355de5f6b054ac1c0b1ec83010e52 Mon Sep 17 00:00:00 2001 From: David Webster Date: Tue, 15 May 2001 19:55:35 +0000 Subject: [PATCH] Modest fix for executables linking to the wx dll for OS/2. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/makeva.env | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/makeva.env b/src/makeva.env index e20f5004c9..b4dc4828fd 100644 --- a/src/makeva.env +++ b/src/makeva.env @@ -117,9 +117,12 @@ D=DebugOS2 WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib INC=-I$(WXINC) -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/xpm -I$(WXDIR)/src/tiff -I$(WXDIR)/src/png -I$(EXTRAINC) -!if "$(WXMAKINGDLL)" == "1" +!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1" LINKLIBS=CPPOM30I.LIB CPPOOC3I.LIB OS2386.LIB $(UPMLIB)\UPM32.LIB $(NETLIB)\NETAPI32.LIB $(TCPIP)\TCP32DLL.LIB $(TCPIP)\SO32DLL.LIB EXTRALIBS=$(WXDIR)\lib\os2pngd.lib $(WXDIR)\lib\os2zlibd.lib $(WXDIR)\lib\os2jpegd.lib $(WXDIR)\lib\os2xpmd.lib $(WXDIR)\lib\os2tiffd.lib +!if "$(WXUSINGDLL)" == "1" +EXTRALIBS=$(EXTRALIBS) $(WXLIB) +!endif LIBS=$(LINKLIBS) $(EXTRALIBS) !else LINKLIBS=CPPOM30.LIB CPPOOC3.LIB OS2386.LIB $(UPMLIB)\UPM32.LIB $(NETLIB)\NETAPI32.LIB $(TCPIP)\TCP32DLL.LIB $(TCPIP)\SO32DLL.LIB