dwindows: makefile.vc annotate

annotate makefile.vc @ 535:b0b5b880513a

Don't reverse packing on vertical boxes to compensate for the inverted Y-axis on OS/2. Instead this should be dealt with in the layout code taking into account the size of the box the items are sitting on. This new code mostly works, but has some problems.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Wed, 24 Mar 2004 00:05:39 +0000
parents	0df4ad2ac083
children	420c6c94abc7

rev	line source
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1 #
381 0df4ad2ac083 Enable dwindows to be built from a directory other than where the mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 286 diff changeset	2 # Get our source directory
0df4ad2ac083 Enable dwindows to be built from a directory other than where the mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 286 diff changeset	3 #
0df4ad2ac083 Enable dwindows to be built from a directory other than where the mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 286 diff changeset	4 !if "$(DWINDOWS_SRCDIR)" == ""
0df4ad2ac083 Enable dwindows to be built from a directory other than where the mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 286 diff changeset	5 SRCDIR=.
0df4ad2ac083 Enable dwindows to be built from a directory other than where the mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 286 diff changeset	6 !else
0df4ad2ac083 Enable dwindows to be built from a directory other than where the mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 286 diff changeset	7 SRCDIR=$(DWINDOWS_SRCDIR)
0df4ad2ac083 Enable dwindows to be built from a directory other than where the mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 286 diff changeset	8 !endif
0df4ad2ac083 Enable dwindows to be built from a directory other than where the mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 286 diff changeset	9
45 90aa71b3298a Fixed makefile for Windows, and updated to latest source. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	10 FXLIBDIR=.\lib
90aa71b3298a Fixed makefile for Windows, and updated to latest source. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 3 diff changeset	11 FXDLLDIR=.\dll
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	13 CC = cl
381 0df4ad2ac083 Enable dwindows to be built from a directory other than where the mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 286 diff changeset	14 CFLAGS = -c -G5 -GD -Zp1 -DWIN32 -D__WIN32__ -DMSVC -DBUILD_DLL -I$(SRCDIR)\platform -I$(SRCDIR)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	15 CFLAGS_DEBUG = -Zi
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	16 CFLAGS_COMPILE = -MTd
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	17 LIBS = wsock32.lib kernel32.lib user32.lib comctl32.lib gdi32.lib advapi32.lib shell32.lib comdlg32.lib
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	18 RES =
191 634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 45 diff changeset	19 LINKFLAGS = -machine:i386 -debug:full
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	20 DLLLINKFLAGS = -dll
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	21 LINK = link
381 0df4ad2ac083 Enable dwindows to be built from a directory other than where the mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 286 diff changeset	22 DEFFILE = $(SRCDIR)\dww.def
0df4ad2ac083 Enable dwindows to be built from a directory other than where the mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 286 diff changeset	23 DEFFILE2 = $(SRCDIR)\dwcompatw.def
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	24
381 0df4ad2ac083 Enable dwindows to be built from a directory other than where the mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 286 diff changeset	25 OBJS = dw.obj
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	26
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	27 OBJS2 = compat.obj dirent.obj
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	28
381 0df4ad2ac083 Enable dwindows to be built from a directory other than where the mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 286 diff changeset	29 all: dw dwcompat dwtest
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	30
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	31 clean:
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	32 -erase *.dll
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	33 -erase *.exe
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	34 -erase *.opt
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	35 -erase *.lib
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	36 -erase *.obj
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	37 -erase *.map
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	38 -erase *.pdb
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	39 -erase *.ilk
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	40 -erase *.exp
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	41 -erase *~
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	42
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	43 dw: dw.dll
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	44
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	45 dw.dll: $(OBJS) $(DEFFILE)
381 0df4ad2ac083 Enable dwindows to be built from a directory other than where the mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 286 diff changeset	46 -mkdir $(FXLIBDIR)
0df4ad2ac083 Enable dwindows to be built from a directory other than where the mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 286 diff changeset	47 -mkdir $(FXDLLDIR)
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	48 $(LINK) @<<
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	49 -out:$(@) -def:$(DEFFILE)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	50 $(LINKFLAGS) $(DLLLINKFLAGS)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	51 $(OBJS) $(RES)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	52 $(LIBS)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	53 <<
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	54 lib /def:$(DEFFILE)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	55 copy dw.lib $(FXLIBDIR)\dw.lib
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	56 copy dw.dll $(FXDLLDIR)\dw.dll
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	57
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	58 dwcompat: dwcompat.dll
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	59
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	60 dwcompat.dll: $(OBJS2) $(DEFFILE2)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	61 $(LINK) @<<
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	62 -out:$(@) -def:$(DEFFILE2)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	63 $(LINKFLAGS) $(DLLLINKFLAGS)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	64 $(OBJS2) $(RES)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	65 $(LIBS)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	66 <<
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	67 lib /def:$(DEFFILE2)
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	68 copy dwcompat.lib $(FXLIBDIR)\dwcompat.lib
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	69 copy dwcompat.dll $(FXDLLDIR)\dwcompat.dll
67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	70
381 0df4ad2ac083 Enable dwindows to be built from a directory other than where the mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 286 diff changeset	71 dw.obj: $(SRCDIR)\win\dw.c
0df4ad2ac083 Enable dwindows to be built from a directory other than where the mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 286 diff changeset	72 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(CFLAGS_COMPILE) $(SRCDIR)\win\dw.c
0df4ad2ac083 Enable dwindows to be built from a directory other than where the mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 286 diff changeset	73
0df4ad2ac083 Enable dwindows to be built from a directory other than where the mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 286 diff changeset	74 dirent.obj: $(SRCDIR)\win\dirent.c
0df4ad2ac083 Enable dwindows to be built from a directory other than where the mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 286 diff changeset	75 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(CFLAGS_COMPILE) $(SRCDIR)\win\dirent.c
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	76
381 0df4ad2ac083 Enable dwindows to be built from a directory other than where the mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 286 diff changeset	77 compat.obj: $(SRCDIR)\compat.c
0df4ad2ac083 Enable dwindows to be built from a directory other than where the mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 286 diff changeset	78 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(CFLAGS_COMPILE) $(SRCDIR)\compat.c
3 67a643a734d9 Import ktk@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	79
381 0df4ad2ac083 Enable dwindows to be built from a directory other than where the mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 286 diff changeset	80 dwtest.obj: $(SRCDIR)\dwtest.c
0df4ad2ac083 Enable dwindows to be built from a directory other than where the mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 286 diff changeset	81 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(CFLAGS_COMPILE) $(SRCDIR)\dwtest.c
191 634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 45 diff changeset	82
286 e9270ff04ced Simple add dwtest as a target, dependent on dwtest.exe. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 191 diff changeset	83 dwtest: dwtest.exe
e9270ff04ced Simple add dwtest as a target, dependent on dwtest.exe. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 191 diff changeset	84
191 634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 45 diff changeset	85 dwtest.exe: dwtest.obj winmain.obj
634625c3239d Fixes for dw_color_xxxx_set() to accept OS/2 style colors, and fixed a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 45 diff changeset	86 $(LINK) $(LINKFLAGS) /out:dwtest.exe dwtest.obj winmain.obj /subsystem:windows $(FXLIBDIR)\dwcompat.lib $(FXLIBDIR)\dw.lib $(LIBS)

Mercurial > dwindows

annotate makefile.vc @ 535:b0b5b880513a