X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/16a12a3d27d3d3e2557bcde15365245ef2675bb4..a959b08869abdec7449d49e18cb069e81a3f83e6:/src/jpeg/MAKEFILE.VA?ds=sidebyside diff --git a/src/jpeg/MAKEFILE.VA b/src/jpeg/MAKEFILE.VA index b25a74a591..7548d0a8d5 100644 --- a/src/jpeg/MAKEFILE.VA +++ b/src/jpeg/MAKEFILE.VA @@ -13,17 +13,26 @@ OBJSUFF=obj SRCSUFF=cpp -OS2FLAGS=/c /W3 /DOS232 /D__VISAGECPP__ /D__WXPM__ /Ss /Q /N100 +OS2FLAGS=/c /W2 /DOS232 /D__VISAGECPP__ /D__WXPM__ /DJPEGLOCAL /Ss /Q /N100 /Tdc OS2LINKFLAGS=/BASE:0x00010000 /PMTYPE:PM /NOE /NOD /ALIGN:16 OS2LIBFLAGS=/NOL /NOE OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB +!if "$(WXMAKINGDLL)" != "0" +EXTRADLLFLAGS=/DWXMAKINGDLL=1 /Ge- /D__OS2DLL__ +EXTRALNKFLAGS=/DLL +!endif + # Change WXDIR or WXWIN to wherever wxWindows is found -WXDIR = h:\dev\wx2\wxWindows +WXDIR = $(WXWIN) OS2JPEGDIR=$(WXDIR)\src\jpeg OS2JPEGINC=$(WINJPEGDIR) +!if "$(WXMAKINGDLL)" != "1" OS2JPEGLIB=$(WXDIR)\lib\os2jpeg.lib +!else +OS2JPEGLIB=$(WXDIR)\lib\os2jpeg.dll +!endif TEMP1TGT=$(WXDIR)\lib\os2jpeg1.lib TEMP2TGT=$(WXDIR)\lib\os2jpeg2.lib @@ -44,7 +53,12 @@ MAKEPRECOMP=/Fi$(PCH) !endif !if "$(FINAL)" == "0" -D=Debug +!if "$(WXMAKINGDLL)" == "1" +D=DebugOS2DLL +!else +D=DebugOS2 +!endif + OPT = DEBUG_FLAGS= /Ti /D__WXDEBUG__ #/Fb LINK_DEBUG_FLAGS=/DEBUG @@ -52,7 +66,11 @@ CRTFLAG=/Gm /Gd !else # /O1 - smallest code # /O2 - fastest code -D=Release +!if "$(WXMAKINGDLL)" == "1" +D=RelseOS2DLL +!else +D=RelseOS2 +!endif OPT = /O+ /Oc /G5 DEBUG_FLAGS= LINK_DEBUG_FLAGS=/RELEASE @@ -62,7 +80,8 @@ CRTFLAG=/Gm /Gd !if [md $(OS2JPEGDIR)\$D] !endif -CPPFLAGS=$(OS2FLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(INC) $(OPT) $(CRTFLAG) +CPPFLAGS=$(OS2FLAGS) $(EXTRADLLFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(INC) $(OPT) $(CRTFLAG) +LINKFKAGS=$(OS2LINKFLAGS) $(EXTRALNKFLAGS) {..\jpeg}.c{..\jpeg\$D}.obj: @echo $< @@ -263,6 +282,8 @@ $(DLIBLIBOBJS): copy ..\jpeg\$D\jquant2.obj copy ..\jpeg\$D\jdmerge.obj +!if "$(WXMAKINGDLL)" != "1" + $(WXDIR)\lib\os2jpeg1.lib: \ $(COMLIBOBJS) \ $(CLIBLIBOBJS) @@ -291,10 +312,24 @@ $(WXDIR)\lib\os2jpeg.lib: \ del $(TEMP1TGT) del $(TEMP2TGT) +!else + +# Update the dynamic link library +$(WXDIR)\lib\os2jpeg.dll: $(OBJECTS) + icc @<< + /B" $(LINKFLAGS)" /Fe$@ + $(LIBS) + $(OBJECTS) + $(WXDIR)\lib\os2jpeg.def +<< + implib $(WXDIR)\lib\os2jpegd.lib $(WXDIR)\lib\os2jpeg.def + +!endif + clean: - del *.obj - del *.exe - del *.lib + del $(OS2JPEGLIB) + erase /N $(OS2JPEGDIR)\$D + rd $(OS2JPEGDIR)\$D cleanall: clean