projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added GetMargins()
[wxWidgets.git]
/
src
/
zlib
/
MAKEFILE.VA
diff --git
a/src/zlib/MAKEFILE.VA
b/src/zlib/MAKEFILE.VA
index 8322d781f65a599aad3cca03913367a93f9d8fb3..5a9abb6310cd3d8dadeb25369160c6ffdeb7a871 100644
(file)
--- a/
src/zlib/MAKEFILE.VA
+++ b/
src/zlib/MAKEFILE.VA
@@
-7,24
+7,32
@@
#
# "%W% %G%"
#
#
# "%W% %G%"
#
-# Makefile : Builds os2
png
.lib library for OS/2 3.0/4.0
+# Makefile : Builds os2
zlib
.lib library for OS/2 3.0/4.0
# Suffixes
OBJSUFF=obj
SRCSUFF=c
# Suffixes
OBJSUFF=obj
SRCSUFF=c
-OS2FLAGS=/c /W
3
/DOS232 /D__VISAGECPP__ /Ss /Q /N100
+OS2FLAGS=/c /W
2
/DOS232 /D__VISAGECPP__ /Ss /Q /N100
OS2LINKFLAGS=/BASE:0x00010000 /PMTYPE:PM /NOE /NOD /ALIGN:16
OS2LIBFLAGS=/NOL /NOE
OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB
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
# Change WXDIR or WXWIN to wherever wxWindows is found
-WXDIR =
j:\dev\wx2\wxWindows
+WXDIR =
$(WXWIN)
OS2ZLIBDIR=$(WXDIR)\src\zlib
OS2ZLIBINC=$(WINPNGDIR)
OS2ZLIBDIR=$(WXDIR)\src\zlib
OS2ZLIBINC=$(WINPNGDIR)
+!if "$(WXMAKINGDLL)" != "1"
OS2ZLIBLIB=$(WXDIR)\lib\os2zlib.lib
OS2ZLIBLIB=$(WXDIR)\lib\os2zlib.lib
-
+!else
+OS2ZLIBLIB=$(WXDIR)\lib\os2zlib.dll
+!endif
INC=
!ifndef FINAL
INC=
!ifndef FINAL
@@
-42,7
+50,11
@@
MAKEPRECOMP=/Fi$(PCH)
!endif
!if "$(FINAL)" == "0"
!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
OPT =
DEBUG_FLAGS= /Ti /D__WXDEBUG__ #/Fb
LINK_DEBUG_FLAGS=/DEBUG
@@
-50,14
+62,22
@@
CRTFLAG=/Gm /Gd
!else
# /O1 - smallest code
# /O2 - fastest code
!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
CRTFLAG=/Gm /Gd
!endif
OPT = /O+ /Oc /G5
DEBUG_FLAGS=
LINK_DEBUG_FLAGS=/RELEASE
CRTFLAG=/Gm /Gd
!endif
-CPPFLAGS=$(OS2FLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(INC) $(OPT) $(CRTFLAG)
+!if [md $(OS2ZLIBDIR)\$D]
+!endif
+
+CPPFLAGS=$(OS2FLAGS) $(EXTRADLLFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(INC) $(OPT) $(CRTFLAG)
+LINKFKAGS=$(OS2LINKFLAGS) $(EXTRALNKFLAGS)
{..\zlib}.c{..\zlib\$D}.obj:
@echo $<
{..\zlib}.c{..\zlib\$D}.obj:
@echo $<
@@
-81,10
+101,9
@@
OBJECTS = \
..\zlib\$D\uncompr.obj \
..\zlib\$D\zutil.obj
..\zlib\$D\uncompr.obj \
..\zlib\$D\zutil.obj
-all: $(OS2ZLIB
DIR)\$D $(OS2ZLIB
LIB)
+all: $(OS2ZLIBLIB)
-$(OS2ZLIBDIR)\$D:
- md $(OS2ZLIBDIR)\$D
+!if "$(WXMAKINGDLL)" != "1"
$(WXDIR)\lib\os2zlib.lib: $(OBJECTS)
touch $(WXDIR)\lib\os2zlib.lib
$(WXDIR)\lib\os2zlib.lib: $(OBJECTS)
touch $(WXDIR)\lib\os2zlib.lib
@@
-93,10
+112,24
@@
$(WXDIR)\lib\os2zlib.lib: $(OBJECTS)
$**;
<<
$**;
<<
+!else
+
+# Update the dynamic link library
+$(WXDIR)\lib\os2zlib.dll: $(OBJECTS)
+ icc @<<
+ /B" $(LINKFLAGS)" /Fe$@
+ $(LIBS)
+ $(OBJECTS)
+ $(WXDIR)\lib\os2zlib.def
+<<
+ implib $(WXDIR)\lib\os2zlibd.lib $(WXDIR)\lib\os2zlib.def
+
+!endif
+
clean:
clean:
- del
*.obj
- del *.exe
- del *.lib
+ del
$(OS2ZLIBLIB)
+ erase /N $(OS2ZLIBDIR)\$D
+ rd $(OS2ZLIBDIR)\$D
cleanall: clean
cleanall: clean