Additional makefiles; changes for compilation with BC++ and GnuWin32

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

distrib/msw/generic.rsp

@@ -52,6 +52,7 @@ src/zlib/*.3
 src/zlib/*.mms
 
 include/wx/*.h
+include/wx/protocol/*.h
 include/wx/*.cpp
 include/wx/wx_setup.vms
 include/wx/common/*.h

docs/msw/install.txt

@@ -116,6 +116,9 @@ Gotchas:
 - install.exe doesn't have built-in decompression because lzexpand.lib
   isn't available with Gnu-Win32. However, you can use it with external
   decompression utilities.
+- Doesn't compile socket-related files due to a syntax error in
+  GnuWin32's Sockets.h.
+- Doesn't compile src/msw/ole files, so no drag and drop.
 
 References:
 

samples/config/makefile.b32

@@ -0,0 +1,63 @@
+#
+# File:		makefile.b32
+# Author:	Julian Smart
+# Created:	1993
+# Updated:	
+# Copyright:
+#
+# "%W% %G%"
+#
+# Makefile : Builds conftest example
+
+# WXWIN and BCCDIR are set by parent make
+
+WXDIR = $(WXWIN)
+!include $(WXDIR)\src\makeb32.env
+
+WXLIBDIR = $(WXDIR)\lib
+WXINC = $(WXDIR)\include\msw
+WXLIB = $(WXLIBDIR)\wx32.lib
+LIBS=$(WXLIB) cw32 import32 ole2w32
+
+TARGET=conftest
+
+!if "$(FINAL)" == "0"
+LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
+OPT = -Od
+DEBUG_FLAGS= -v
+!else
+LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
+OPT = -Od
+DEBUG_FLAGS =
+!endif
+CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
+
+OBJECTS = conftest.obj
+
+$(TARGET).exe:	$(OBJECTS) $(TARGET).res
+  tlink32 $(LINKFLAGS) @&&!
+c0w32.obj $(OBJECTS)
+$(TARGET)
+nul
+$(LIBS)
+!
+        brc32 -K $(TARGET).res
+
+.$(SRCSUFF).obj:
+	bcc32 $(CPPFLAGS) -c {$< }
+
+.c.obj:
+	bcc32 $(CPPFLAGS) -P- -c {$< }
+
+conftest.obj:      conftest.$(SRCSUFF)
+
+$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
+    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
+
+clean:
+        -erase *.obj
+        -erase *.exe
+        -erase *.res
+        -erase *.map
+        -erase *.rws
+

samples/config/makefile.g95

@@ -0,0 +1,37 @@
+#
+# File:		makefile.unx
+# Author:	Julian Smart
+# Created:	1993
+# Updated:	
+# Copyright:	(c) 1993, AIAI, University of Edinburgh
+#
+# "%W% %G%"
+#
+# Makefile for conftest example (UNIX).
+
+WXDIR = ../..
+
+# All common UNIX compiler flags and options are now in
+# this central makefile.
+include $(WXDIR)/src/makeg95.env
+
+OBJECTS = $(OBJDIR)/conftest.$(OBJSUFF) $(OBJDIR)/conftest_resources.$(OBJSUFF)
+
+all:    $(OBJDIR) conftest$(GUISUFFIX)$(EXESUFF)
+
+wx:
+
+$(OBJDIR):
+	mkdir $(OBJDIR)
+
+conftest$(GUISUFFIX)$(EXESUFF):	$(OBJECTS) $(WXLIB)
+	$(CC) $(LDFLAGS) -o conftest$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS)
+
+$(OBJDIR)/conftest.$(OBJSUFF):	conftest.$(SRCSUFF)
+	$(CC) -c $(CPPFLAGS) -o $@ conftest.$(SRCSUFF)
+
+$(OBJDIR)/conftest_resources.o:  conftest.rc
+	$(RESCOMP) -i conftest.rc -o $(OBJDIR)/conftest_resources.o $(RESFLAGS)
+
+clean:
+	rm -f $(OBJECTS) conftest$(GUISUFFIX).exe core *.rsc *.res

samples/makefile.g95

@@ -29,6 +29,8 @@ all:
 	        cd $(WXDIR)/samples/toolbar; make -f makefile.g95
 	        cd $(WXDIR)/samples/dialogs; make -f makefile.g95
 	        cd $(WXDIR)/samples/docview; make -f makefile.g95
+	        cd $(WXDIR)/samples/docvwmdi; make -f makefile.g95
+	        cd $(WXDIR)/samples/sashtest; make -f makefile.g95
 	        cd $(WXDIR)/samples/controls; make -f makefile.g95
 	        cd $(WXDIR)/samples/nativdlg; make -f makefile.g95
 	        cd $(WXDIR)/samples/grid; make -f makefile.g95
@@ -37,8 +39,8 @@ all:
 	        cd $(WXDIR)/samples/dnd; make -f makefile.g95
 	        cd $(WXDIR)/samples/ownerdrw; make -f makefile.g95
 	        cd $(WXDIR)/samples/joytest; make -f makefile.g95
-	        cd $(WXDIR)/samples/regtest; make -f makefile.g95
 	        cd $(WXDIR)/samples/memcheck; make -f makefile.g95
+#	        cd $(WXDIR)/samples/regtest; make -f makefile.g95
 
 clean:
 	        cd $(WXDIR)/samples/splitter; make -f makefile.g95 clean
@@ -53,6 +55,8 @@ clean:
 	        cd $(WXDIR)/samples/treectrl; make -f makefile.g95 clean
 	        cd $(WXDIR)/samples/validate; make -f makefile.g95 clean
 	        cd $(WXDIR)/samples/docview; make -f makefile.g95 clean
+	        cd $(WXDIR)/samples/docvwmdi; make -f makefile.g95 clean
+	        cd $(WXDIR)/samples/sashtest; make -f makefile.g95 clean
 	        cd $(WXDIR)/samples/controls; make -f makefile.g95 clean
 	        cd $(WXDIR)/samples/nativdlg; make -f makefile.g95 clean
 	        cd $(WXDIR)/samples/grid; make -f makefile.g95 clean

samples/makefile.nt

@@ -48,6 +48,8 @@ all:
         nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
         cd $(WXDIR)\samples\docview
         nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
+        cd $(WXDIR)\samples\docvwmdi
+        nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
         cd $(WXDIR)\samples\controls
         nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
         cd $(WXDIR)\samples\nativdlg
@@ -62,14 +64,16 @@ all:
         nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
         cd $(WXDIR)\samples\taskbar
         nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
-        cd $(WXDIR)\samples\memcheck
+        cd $(WXDIR)\samples\sashtest
         nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
-        cd $(WXDIR)\samples\regtest
+        cd $(WXDIR)\samples\memcheck
         nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
         cd $(WXDIR)\samples\ownerdrw
         nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
         cd $(WXDIR)\samples\checklst
         nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
+#        cd $(WXDIR)\samples\regtest
+#        nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
 #        cd $(WXDIR)\samples\hello
 #        nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
 #        cd $(WXDIR)\samples\fractal
@@ -116,6 +120,8 @@ clean:
         nmake -f makefile.nt clean
         cd $(WXDIR)\samples\docview
         nmake -f makefile.nt clean
+        cd $(WXDIR)\samples\docvwmdi
+        nmake -f makefile.nt clean
         cd $(WXDIR)\samples\controls
         nmake -f makefile.nt clean
         cd $(WXDIR)\samples\nativdlg
@@ -136,6 +142,8 @@ clean:
         nmake -f makefile.nt clean
         cd $(WXDIR)\samples\taskbar
         nmake -f makefile.nt clean
+        cd $(WXDIR)\samples\sashtest
+        nmake -f makefile.nt clean
         cd $(WXDIR)\samples\memcheck
         nmake -f makefile.nt clean
 #        cd $(WXDIR)\samples\hello

samples/minimal/makefile.b32

@@ -1,13 +1,13 @@
 #
-# File:		makefile.bcc
+# File:		makefile.b32
 # Author:	Julian Smart
 # Created:	1993
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
 # "%W% %G%"
 #
-# Makefile : Builds minimal example (DOS).
+# Makefile : Builds minimal example
 
 # WXWIN and BCCDIR are set by parent make
 
@@ -34,13 +34,12 @@ CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
 
 OBJECTS = minimal.obj
 
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
+$(TARGET).exe:	$(OBJECTS) $(TARGET).res
   tlink32 $(LINKFLAGS) @&&!
 c0w32.obj $(OBJECTS)
 $(TARGET)
 nul
 $(LIBS)
-$(TARGET).def
 !
         brc32 -K $(TARGET).res
 

samples/minimal/makefile.g95

@@ -7,7 +7,7 @@
 #
 # "%W% %G%"
 #
-# Makefile for minimal example (UNIX).
+# Makefile for conftest example (UNIX).
 
 WXDIR = ../..
 
@@ -15,23 +15,23 @@ WXDIR = ../..
 # this central makefile.
 include $(WXDIR)/src/makeg95.env
 
-OBJECTS = $(OBJDIR)/minimal.$(OBJSUFF) $(OBJDIR)/minimal_resources.$(OBJSUFF)
+OBJECTS = $(OBJDIR)/conftest.$(OBJSUFF) $(OBJDIR)/conftest_resources.$(OBJSUFF)
 
-all:    $(OBJDIR) minimal$(GUISUFFIX)$(EXESUFF)
+all:    $(OBJDIR) conftest$(GUISUFFIX)$(EXESUFF)
 
 wx:
 
 $(OBJDIR):
 	mkdir $(OBJDIR)
 
-minimal$(GUISUFFIX)$(EXESUFF):	$(OBJECTS) $(WXLIB)
+conftest$(GUISUFFIX)$(EXESUFF):	$(OBJECTS) $(WXLIB)
-	$(CC) $(LDFLAGS) -o minimal$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS)
+	$(CC) $(LDFLAGS) -o conftest$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS)
 
-$(OBJDIR)/minimal.$(OBJSUFF):	minimal.$(SRCSUFF)
+$(OBJDIR)/conftest.$(OBJSUFF):	conftest.$(SRCSUFF)
-	$(CC) -c $(CPPFLAGS) -o $@ minimal.$(SRCSUFF)
+	$(CC) -c $(CPPFLAGS) -o $@ conftest.$(SRCSUFF)
 
-$(OBJDIR)/minimal_resources.o:  minimal.rc
+$(OBJDIR)/conftest_resources.o:  conftest.rc
-	$(RESCOMP) -i minimal.rc -o $(OBJDIR)/minimal_resources.o $(RESFLAGS)
+	$(RESCOMP) -i conftest.rc -o $(OBJDIR)/conftest_resources.o $(RESFLAGS)
 
 clean:
-	rm -f $(OBJECTS) minimal$(GUISUFFIX).exe core *.rsc *.res
+	rm -f $(OBJECTS) conftest$(GUISUFFIX).exe core *.rsc *.res

samples/sashtest/makefile.b32

@@ -0,0 +1,63 @@
+#
+# File:		makefile.bcc
+# Author:	Julian Smart
+# Created:	1993
+# Updated:	
+# Copyright:	(c) 1993, AIAI, University of Edinburgh
+#
+# "%W% %G%"
+#
+# Makefile : Builds sashtest example (DOS).
+
+# WXWIN and BCCDIR are set by parent make
+
+WXDIR = $(WXWIN)
+!include $(WXDIR)\src\makeb32.env
+
+WXLIBDIR = $(WXDIR)\lib
+WXINC = $(WXDIR)\include\msw
+WXLIB = $(WXLIBDIR)\wx32.lib
+LIBS=$(WXLIB) cw32 import32 ole2w32
+
+TARGET=sashtest
+
+!if "$(FINAL)" == "0"
+LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
+OPT = -Od
+DEBUG_FLAGS= -v
+!else
+LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
+OPT = -Od
+DEBUG_FLAGS =
+!endif
+CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
+
+OBJECTS = sashtest.obj
+
+$(TARGET).exe:	$(OBJECTS) $(TARGET).res
+  tlink32 $(LINKFLAGS) @&&!
+c0w32.obj $(OBJECTS)
+$(TARGET)
+nul
+$(LIBS)
+!
+        brc32 -K $(TARGET).res
+
+.$(SRCSUFF).obj:
+	bcc32 $(CPPFLAGS) -c {$< }
+
+.c.obj:
+	bcc32 $(CPPFLAGS) -P- -c {$< }
+
+sashtest.obj:      sashtest.$(SRCSUFF)
+
+$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
+    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
+
+clean:
+        -erase *.obj
+        -erase *.exe
+        -erase *.res
+        -erase *.map
+        -erase *.rws
+

samples/sashtest/makefile.g95

@@ -0,0 +1,37 @@
+#
+# File:		makefile.unx
+# Author:	Julian Smart
+# Created:	1993
+# Updated:	
+# Copyright:	(c) 1993, AIAI, University of Edinburgh
+#
+# "%W% %G%"
+#
+# Makefile for sashtest example (UNIX).
+
+WXDIR = ../..
+
+# All common UNIX compiler flags and options are now in
+# this central makefile.
+include $(WXDIR)/src/makeg95.env
+
+OBJECTS = $(OBJDIR)/sashtest.$(OBJSUFF) $(OBJDIR)/sashtest_resources.$(OBJSUFF)
+
+all:    $(OBJDIR) sashtest$(GUISUFFIX)$(EXESUFF)
+
+wx:
+
+$(OBJDIR):
+	mkdir $(OBJDIR)
+
+sashtest$(GUISUFFIX)$(EXESUFF):	$(OBJECTS) $(WXLIB)
+	$(CC) $(LDFLAGS) -o sashtest$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS)
+
+$(OBJDIR)/sashtest.$(OBJSUFF):	sashtest.$(SRCSUFF)
+	$(CC) -c $(CPPFLAGS) -o $@ sashtest.$(SRCSUFF)
+
+$(OBJDIR)/sashtest_resources.o:  sashtest.rc
+	$(RESCOMP) -i sashtest.rc -o $(OBJDIR)/sashtest_resources.o $(RESFLAGS)
+
+clean:
+	rm -f $(OBJECTS) sashtest$(GUISUFFIX).exe core *.rsc *.res

samples/wxsocket/client.cpp

@@ -123,7 +123,7 @@ bool MyApp::OnInit(void)
   frame->Show(TRUE);
   
   // Return the main frame window
-  return true;
+  return TRUE;
 }
 
 /*

samples/wxsocket/makefile.b32

@@ -1,82 +1,76 @@
 #
 # File:		makefile.b32
-# Author:	Patrick Halke, modified by Guilhem Lavaux
+# Author:	Guilhem Lavaux
-# Created:	1997
+# Created:	1998
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:	(c) Guilhem Lavaux
 #
 # "%W% %G%"
 #
-# Makefile : Builds 32bit wxstring library for Windows 3.1
+# Makefile : Builds 32-bit wxSocket sample under BC++
-# and Borland C++ 4.x
 
 WXDIR = $(WXWIN)
 
+ZLIB = $(WXDIR)\lib\zlib.lib
+
 !include $(WXDIR)\src\makeb32.env
 
 WXLIBDIR = $(WXDIR)\lib
-WXLIB = $(WXDIR)\lib\wx32.lib
-SOCKETLIB = $(WXDIR)\lib\wxsocket.lib $(WXDIR)\lib\zlib.lib
 WXINC = $(WXDIR)\include\msw
-WXBASESRC = $(WXDIR)\src\base
+WXLIB = $(WXLIBDIR)\wx32.lib
-WXBASEINC = $(WXDIR)\include\base
+LIBS=$(WXLIB) $(ZLIB) cw32 import32 ole2w32
-LIBS=$(WXLIB) $(SOCKETLIB) cw32 import32
-
-!ifndef DEBUG
-DEBUG=0
-!endif
 
 !if "$(FINAL)" == "0"
 LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
 OPT = -Od
-DEBUG_FLAGS= -v -DDEBUG=$(DEBUG)
+DEBUG_FLAGS= -v
 !else
 LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -O2
+OPT = -Od
-DEBUG_FLAGS = -DDEBUG=$(DEBUG)
+DEBUG_FLAGS =
 !endif
-
 CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
 
+.$(SRCSUFF).obj:
+	bcc32 $(CPPFLAGS) -c {$< }
+
+.c.obj:
+	bcc32 $(CPPFLAGS) -P- -c {$< }
+
 CLIENT_TARGET=client
 SERVER_TARGET=server
 CLIENT_OBJECTS=client.obj
 SERVER_OBJECTS=server.obj
 
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
 all:    $(CLIENT_TARGET).exe $(SERVER_TARGET).exe
 
-$(CLIENT_TARGET).exe:   $(CLIENT_OBJECTS) $(CLIENT_TARGET).def $(CLIENT_TARGET).res
+$(CLIENT_TARGET).exe:   $(CLIENT_OBJECTS) $(CLIENT_TARGET).res
   tlink32 $(LINKFLAGS) @&&!
   c0w32.obj $(CLIENT_OBJECTS)
   $(CLIENT_TARGET)
   nul
   $(LIBS)
-  $(CLIENT_TARGET).def
 !
           brc32 -K $(CLIENT_TARGET).res
 
 client.obj:     client.cpp
 
-$(CLIENT_TARGET).res :      $(CLIENT_TARGET).rc $(WXDIR)\include\msw\wx.rc
+$(CLIENT_TARGET).res :      $(CLIENT_TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa $(CLIENT_TARGET)
+    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(CLIENT_TARGET)
 
-$(SERVER_TARGET).exe:   $(SERVER_OBJECTS) $(SERVER_TARGET).def $(SERVER_TARGET).res
+$(SERVER_TARGET).exe:   $(SERVER_OBJECTS) $(SERVER_TARGET).res
   tlink32 $(LINKFLAGS) @&&!
   c0w32.obj $(SERVER_OBJECTS)
   $(SERVER_TARGET)
   nul
   $(LIBS)
-  $(SERVER_TARGET).def
 !
         brc32 -K $(SERVER_TARGET).res
 
 server.obj:     server.cpp
 
-$(SERVER_TARGET).res:   $(SERVER_TARGET).rc $(WXDIR)\include\msw\wx.rc
+$(SERVER_TARGET).res:   $(SERVER_TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa $(SERVER_TARGET)
+    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(SERVER_TARGET)
 
 clean:
         -erase *.obj

samples/wxsocket/makefile.g95

@@ -1,14 +1,13 @@
 #
 # File:		makefile.unx
-# Author:	Stefan Hammes
+# Author:	Julian Smart
-# Created:	1995
+# Created:	1993
 # Updated:	
-# Copyright:	(c) 1995
+# Copyright:	(c) 1993, AIAI, University of Edinburgh
 #
 # "%W% %G%"
 #
-# Makefile for wxString example (UNIX).
+# Makefile for server/client example (UNIX).
-# Change the WXDIR directory, and CPPFLAGS and LDFLAGS, for your system.
 
 WXDIR = ../..
 
@@ -16,60 +15,32 @@ WXDIR = ../..
 # this central makefile.
 include $(WXDIR)/src/makeg95.env
 
-WXSOCKDIR = $(WXDIR)/contrib/wxsock
+OBJECTS=$(OBJDIR)/server.$(OBJSUFF) $(OBJDIR)/server_resources.$(OBJSUFF)\
-WXSOCKLIB = $(WXSOCKDIR)/libwxsock.a
+ $(OBJDIR)/client.$(OBJSUFF) $(OBJDIR)/client_resources.$(OBJSUFF)
 
-OBJECTS = $(OBJDIR)/wx_sock.$(OBJSUFF) $(OBJDIR)/wx_addr.$(OBJSUFF) \
+all:	$(OBJDIR) server$(GUISUFFIX) client$(GUISUFFIX)
-	$(OBJDIR)/wx_pkman.$(OBJSUFF) $(OBJDIR)/wx_skflt.$(OBJSUFF) \
-	$(OBJDIR)/wx_lzw.$(OBJSUFF) \
-	$(OBJDIR)/wx_url.$(OBJSUFF) $(OBJDIR)/wx_ftp.$(OBJSUFF) \
-	$(OBJDIR)/wx_file.$(OBJSUFF) $(OBJDIR)/wx_nipc.$(OBJSUFF) \
-	$(OBJDIR)/wx_wipc.$(OBJSUFF) $(OBJDIR)/wx_sipc.$(OBJSUFF)
 
-TESTOBJECTS = $(OBJDIR)/test.$(OBJSUFF)
-TESTPROGRAM = $(WXSTRINGDIR)/test$(GUISUFFIX)
-
-LDFLAGS =  $(XLIB) -L$(WXSOCKDIR) -L$(WXDIR)/lib
-
-XVIEWLDLIBS = -lwxstring_ol -lwx_ol -lxview -lolgx -lX11 -lm $(COMPLIBS)
-MOTIFLDLIBS = -lwxstring_motif -lwx_motif -lXm -lXt -lX11 -lm $(COMPLIBS)
-HPLDLIBS = -lwxstring_hp -lwx_hp -lXm -lXt -lX11 -lm $(HPCOMPLIBS)
-# Default
-LDLIBS=$(MOTIFLDLIBS)
-
-all:	$(OBJDIR) $(WXSOCKLIB)
-
-demo:	$(TESTPROGRAM)
-
-.SUFFIXES:
-
-# Comment this out if 'say' doesn't speak on your system, or make it beep perhaps!
-done:
-	say dun
-
-wx:
-	cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx GUI=$(GUI)
 
 $(OBJDIR):
 	mkdir $(OBJDIR)
 
-$(WXSOCKLIB): $(OBJECTS)	
+server$(GUISUFFIX): $(OBJDIR)/server.$(OBJSUFF) $(OBJDIR)/server_resources.$(OBJSUFF) $(WXLIB)
-	rm -f $@
+	$(CC) $(LDFLAGS) -o server$(GUISUFFIX)$(EXESUFF) $(OBJDIR)/server.$(OBJSUFF) $(OBJDIR)/server_resources.$(OBJSUFF) $(LDLIBS)
-	ar $(AROPTIONS) libwxsock.a $(OBJECTS)
-	$(RANLIB) libwxsock.a
 
-$(OBJDIR)/wx_sock.$(OBJSUFF):	wx_sock.$(SRCSUFF) wx_sock.h
+$(OBJDIR)/server.$(OBJSUFF):        server.$(SRCSUFF) server.h
-	$(CC) -c $(CPPFLAGS) -o $@ wx_sock.$(SRCSUFF)
+	$(CC) -c $(CPPFLAGS) -o $@ server.$(SRCSUFF)
 
-$(OBJDIR)/wx_addr.$(OBJSUFF):	wx_addr.$(SRCSUFF) wx_addr.h
+client$(GUISUFFIX): $(OBJDIR)/client.$(OBJSUFF) $(OBJDIR)/client_resources.$(OBJSUFF) $(WXLIB)
-	$(CC) -c $(CPPFLAGS) -o $@ wx_addr.$(SRCSUFF)
+	$(CC) $(LDFLAGS) -o client$(GUISUFFIX)$(EXESUFF) $(OBJDIR)/client.$(OBJSUFF) $(OBJDIR)/client_resources.$(OBJSUFF) $(LDLIBS)
 
-$(OBJDIR)/test.$(OBJSUFF):   test.$(SRCSUFF)
+$(OBJDIR)/client.$(OBJSUFF):        client.$(SRCSUFF) client.h
-	$(CC) -c $(CPPFLAGS) -o $@ test.$(SRCSUFF)
+	$(CC) -c $(CPPFLAGS) -o $@ client.$(SRCSUFF)
+        
+$(OBJDIR)/server_resources.o:  server.rc
+	$(RESCOMP) -i server.rc -o $(OBJDIR)/server_resources.o $(RESFLAGS)
 
-$(TESTPROGRAM): $(OBJDIR)/test.$(OBJSUFF) $(WXLIB) $(WXSOCKLIB)
+$(OBJDIR)/client_resources.o:  client.rc
-	$(CC) $(CPPFLAGS) $(LDFLAGS) -o test$(GUISUFFIX) $(OBJDIR)/test.$(OBJSUFF) $(XVIEW_LINK) $(LDLIBS)
+	$(RESCOMP) -i client.rc -o $(OBJDIR)/client_resources.o $(RESFLAGS)
 
 clean:
-	rm -f $(OBJECTS) test$(GUISUFFIX) $(WXSTRINGLIB) $(OBJDIR)/test.$(OBJSUFF) core
+	rm -f $(OBJECTS) server$(GUISUFFIX).exe client$(GUISUFFIX).exe core *.rsc *.res
-

src/common/dynlib.cpp

@@ -30,6 +30,10 @@
 #include <windows.h>
 #endif
 
+#ifdef LoadLibrary
+#undef LoadLibrary
+#endif
+
 // ---------------------------------------------------------------------------
 // Global variables
 // ---------------------------------------------------------------------------
@@ -154,7 +158,11 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
 #elif defined(__WINDOWS__)
   lib_name += ".dll";
 
-  HMODULE handle = LoadLibrary(lib_name);
+#ifdef UNICODE
+  HMODULE handle = LoadLibraryW(lib_name);
+#else
+  HMODULE handle = LoadLibraryA(lib_name);
+#endif
   if (!handle)
     return NULL;
 #else

src/common/parser.y

@@ -3,6 +3,9 @@
 #ifdef _MSC_VER
 #include <io.h>
 #endif
+#ifdef __GNUWIN32__
+#include <sys/unistd.h>
+#endif
 
 #include "wx/expr.h"
 

src/generic/laywin.cpp

@@ -12,6 +12,10 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifdef __GNUG__
+#pragma implementation "laywin.h"
+#endif
+
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 

src/makeg95.env

@@ -51,14 +51,6 @@ RESFLAGS=--include-dir $(WXDIR)/include --define __WIN32__ --define __WIN95__ --
 ########################## Compiler flags #############################
 
 # Miscellaneous compiler options
-# Solaris/GCC: -DSVR4
-# Solaris/GCC, dynamic library: -DSVR4 -fPIC
-# FreeBDS 2.0: does not need -D_BSD - always defined
-# AIX/CSet++: -+ -qsrcmsg -DSYSV
-# AIX/GCC: -DSYSV -DAIX
-# Data General: -DDG
-# HP: -D_HPUX_SOURCE +a1 -Aa +d -z
-# IRIX: -mips2
 OPTIONS= # -D__MINGW32__ # -D__EGCS__
 
 # Debugging information
@@ -95,10 +87,6 @@ RESSUFF=res
 RSCSUFF=rsc
 
 # Warnings
-# AIX: comment out
-# IRIX: -w -wlint,-fpiv
-# These are for the GNU compiler. We now get the compiler to check for as
-# many things as we can, to catch portability problems sooner.
 WARN = -Wall
 
 # Which GUI, -Dwx_xview or -Dwx_motif (don't change this)
@@ -106,9 +94,6 @@ GUI = -D__WXMSW__ -D__WINDOWS__
 
 # Optimization
 # OPT = -O
-# FreeBSD 2.0 with i486: OPT = -O2 -m486
-# IRIX: -O2 #-O0 : no, -O1: quick, -O2: global -O3: full(register)
-# Linux: -m486 # -O2 for optimization
 OPT =
 
 # Options for ar archiver
@@ -117,24 +102,11 @@ AROPTIONS = ruv
 RANLIB = ranlib
 
 # Compiler libraries: defaults to GCC libraries
-# Solaris: -lgen -ldl -lsocket -lnsl
-#   and/or possibly -lucb, whatever that is... (-lucb CAUSES MOTIF FILE SELECTION PROBLEMS)
-#   or possibly -lgen -lsocket -L/usr/ccs/lib linbnsl.a 
-# GCC > 2.7.1 on Solaris: -lstdc++ -lc -lgen -ldl -lsocket -lnsl -lucb 
-# SGI:     -lPW
-# FreeBSD 2.0: -lg++ -lcompat
-# FreeBSD 1.x: -lcompat doesn`t need, only -lg++ needed
-# AIX: -lCns -lbsd
-# G++ 2.7.0 requires -liostream too.
-# IRIX: -lPW
 #COMPLIBS=-lg++
 #for win95
 #COMPLIBS=-lgcc
 
 # Compiler or system-specific include paths
-# E.g. some SPARCStations need
-# -I/usr/ucbinclude/sys
-#added for win95
 COMPPATHS=
 
 ########################## Directories ###############################
@@ -142,7 +114,7 @@ COMPPATHS=
 
 WINLIBS=-lstdc++ -lgcc \
 	-lwinspool -lwinmm -lshell32 -loldnames \
-	-lcomctl32 -lctl3d32 -lodbc32
+	-lcomctl32 -lctl3d32 -lodbc32 -ladvapi32
 
 # Shouldn't need to change these...
 WXSRC=$(WXDIR)/src/msw

src/msw/app.cpp

@@ -14,7 +14,6 @@
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
-#define IN_WX_MAIN_CPP
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)
@@ -1022,5 +1021,3 @@ HINSTANCE wxGetInstance()
 #include "main.cpp"
 #endif
 
-#undef IN_WX_MAIN_CPP
-

src/msw/bitmap.cpp

@@ -394,7 +394,7 @@ wxBitmap wxBitmap::GetBitmapForDC(wxDC& dc) const
     LPBITMAPINFO    lpDib;
     void            *lpBits = NULL;
 
-    wxASSERT( this->GetPalette() && this->GetPalette()->Ok() && (this->GetPalette()->GetHPALETTE() != NULL) );
+    wxASSERT( this->GetPalette() && this->GetPalette()->Ok() && (this->GetPalette()->GetHPALETTE() != 0) );
 
     tmpBitmap.SetPalette(this->GetPalette());
     memDC.SelectObject(tmpBitmap);

src/msw/dib.cpp

@@ -26,7 +26,6 @@
  *******************************************************************************/
 
 // For compilers that support precompilation, includes "wx.h".
-#define IN_WX_MAIN_CPP
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)

src/msw/makefile.b32

@@ -75,10 +75,12 @@ GENERICOBJS= \
   $(MSWDIR)\fontdlgg.obj \
   $(MSWDIR)\gridg.obj \
   $(MSWDIR)\helpxlp.obj \
+  $(MSWDIR)\laywin.obj \
   $(MSWDIR)\msgdlgg.obj \
   $(MSWDIR)\panelg.obj \
   $(MSWDIR)\printps.obj \
   $(MSWDIR)\prntdlgg.obj \
+  $(MSWDIR)\sashwin.obj \
   $(MSWDIR)\scrolwin.obj \
   $(MSWDIR)\splitter.obj \
   $(MSWDIR)\statusbr.obj \
@@ -578,6 +580,8 @@ $(MSWDIR)\gridg.obj:     $(GENDIR)\gridg.$(SRCSUFF)
 
 $(MSWDIR)\helpxlp.obj:     $(GENDIR)\helpxlp.$(SRCSUFF)
 
+$(MSWDIR)\laywin.obj:     $(GENDIR)\laywin.$(SRCSUFF)
+
 $(MSWDIR)\msgdlgg.obj:     $(GENDIR)\msgdlgg.$(SRCSUFF)
 
 $(MSWDIR)\panelg.obj:     $(GENDIR)\panelg.$(SRCSUFF)
@@ -586,6 +590,8 @@ $(MSWDIR)\printps.obj:     $(GENDIR)\printps.$(SRCSUFF)
 
 $(MSWDIR)\prntdlgg.obj:     $(GENDIR)\prntdlgg.$(SRCSUFF)
 
+$(MSWDIR)\sashwin.obj:     $(GENDIR)\sashwin.$(SRCSUFF)
+
 $(MSWDIR)\scrolwin.obj:     $(GENDIR)\scrolwin.$(SRCSUFF)
 
 $(MSWDIR)\splitter.obj:     $(GENDIR)\splitter.$(SRCSUFF)

src/msw/makefile.g95

@@ -65,10 +65,12 @@ GENERICOBJS= \
   $(GENDIR)/fontdlgg.$(OBJSUFF) \
   $(GENDIR)/gridg.$(OBJSUFF) \
   $(GENDIR)/helpxlp.$(OBJSUFF) \
+  $(GENDIR)/laywin.$(OBJSUFF) \
   $(GENDIR)/msgdlgg.$(OBJSUFF) \
   $(GENDIR)/panelg.$(OBJSUFF) \
   $(GENDIR)/printps.$(OBJSUFF) \
   $(GENDIR)/prntdlgg.$(OBJSUFF) \
+  $(GENDIR)/sashwin.$(OBJSUFF) \
   $(GENDIR)/scrolwin.$(OBJSUFF) \
   $(GENDIR)/splitter.$(OBJSUFF) \
   $(GENDIR)/statusbr.$(OBJSUFF) \
@@ -112,15 +114,29 @@ COMMONOBJS = \
   $(COMMDIR)/list.$(OBJSUFF) \
   $(COMMDIR)/string.$(OBJSUFF) \
   $(COMMDIR)/time.$(OBJSUFF) \
+  $(COMMDIR)/tokenzr.$(OBJSUFF) \
   $(COMMDIR)/y_tab.$(OBJSUFF) \
   $(COMMDIR)/stream.$(OBJSUFF) \
   $(COMMDIR)/fstream.$(OBJSUFF) \
   $(COMMDIR)/mstream.$(OBJSUFF) \
   $(COMMDIR)/zstream.$(OBJSUFF) \
   $(COMMDIR)/datstrm.$(OBJSUFF) \
+  $(COMMDIR)/objstrm.$(OBJSUFF) \
   $(COMMDIR)/extended.$(OBJSUFF) \
   $(COMMDIR)/wincmn.$(OBJSUFF)
 
+# Unfortunately, GnuWin32 fails with a syntax error in Sockets.h,
+# so remove socket code.
+#  $(COMMDIR)/socket.$(OBJSUFF) \
+#  $(COMMDIR)/sckaddr.$(OBJSUFF) \
+#  $(COMMDIR)/sckfile.$(OBJSUFF) \
+#  $(COMMDIR)/sckipc.$(OBJSUFF) \
+#  $(COMMDIR)/sckstrm.$(OBJSUFF) \
+#  $(COMMDIR)/protocol.$(OBJSUFF) \
+#  $(COMMDIR)/http.$(OBJSUFF) \
+#  $(COMMDIR)/ftp.$(OBJSUFF) \
+#  $(COMMDIR)/url.$(OBJSUFF) \
+
 MSWOBJS = \
   accel.$(OBJSUFF) \
   app.$(OBJSUFF) \
@@ -201,12 +217,14 @@ MSWOBJS = \
   utils.$(OBJSUFF) \
   utilsexc.$(OBJSUFF) \
   wave.$(OBJSUFF) \
-  window.$(OBJSUFF) \
+  window.$(OBJSUFF)
-  $(OLEDIR)/droptgt.$(OBJSUFF) \
+
-  $(OLEDIR)/dropsrc.$(OBJSUFF) \
+# OLE not supported yet by GnuWin32 (?)
-  $(OLEDIR)/dataobj.$(OBJSUFF) \
+#  $(OLEDIR)/droptgt.$(OBJSUFF) \
-  $(OLEDIR)/oleutils.$(OBJSUFF) \
+#  $(OLEDIR)/dropsrc.$(OBJSUFF) \
-  $(OLEDIR)/uuid.$(OBJSUFF)
+#  $(OLEDIR)/dataobj.$(OBJSUFF) \
+#  $(OLEDIR)/oleutils.$(OBJSUFF) \
+#  $(OLEDIR)/uuid.$(OBJSUFF)
 
 OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS)
 
@@ -255,46 +273,6 @@ $(COMMDIR)/y_tab.c:	$(COMMDIR)/parser.y
 
 
 # Extra targets
-prologio:
-	cd $(WXDIR)/utils/prologio/src ; $(MAKE) -f makefile.g95
-	cd $(WXDIR)/src/msw
-
-clean_proio:
-	cd $(WXDIR)/utils/prologio/src; $(MAKE) -f makefile.g95 clean
-	cd $(WXDIR)/src/msw
-
-makedib:
-	cd $(WXDIR)/src/msw/dib ; $(MAKE) -f makefile.g95
-	cd $(WXDIR)/src/msw
-
-clean_dib:
-	cd $(WXDIR)/src/msw/dib; $(MAKE) -f makefile.g95 clean
-	cd $(WXDIR)/src/msw
-
-gauge:
-	cd $(WXDIR)/src/msw/gauge; $(MAKE) -f makefile.g95
-	cd $(WXDIR)/src/msw
-
-clean_gauge:
-	cd $(WXDIR)/src/msw/gauge; $(MAKE) -f makefile.g95 clean
-	cd $(WXDIR)/src/msw
-
-wxstring:
-	cd $(WXDIR)/contrib/wxstring; $(MAKE) -f makefile.g95 OPTIONS="$(OPTIONS)" DEBUG="$(DEBUG)"
-	cd $(WXDIR)/src/msw
-
-clean_wxstring:
-	cd $(WXDIR)/contrib/wxstring; $(MAKE) -f makefile.g95 clean
-	cd $(WXDIR)/src/msw
-
-itsy:
-	cd $(WXDIR)/src/msw/itsybits; $(MAKE) -f makefile.g95
-	cd $(WXDIR)/src/msw
-
-clean_itsy:
-	cd $(WXDIR)/contrib/itsybits; $(MAKE) -f makefile.g95 clean
-	cd $(WXDIR)/src/msw
-
 rcparser:
 	cd $(WXDIR)/utils/rcparser/src; $(MAKE)  -f makefile.g95
 	cd $(WXDIR)/src/msw
@@ -303,14 +281,6 @@ clean_rcp:
 	cd $(WXDIR)/utils/rcparser/src; $(MAKE) -f makefile.g95 clean
 	cd $(WXDIR)/src/msw
 
-# +++start steve161(09.04.1995): added for wxString in \contrib\wxstring
-wxstring_ol:
-	cd ../../contrib/wxstring; $(MAKE) -f makefile.unx xview
-wxstring_motif:
-	cd ../../contrib/wxstring; $(MAKE) -f makefile.unx motif
-wxstring_hp:
-	cd ../../contrib/wxstring; $(MAKE) -f makefile.unx hp
-
 clean:
 	rm -f $(OBJECTS) $(EXTRAOBJS) ../common/y_tab.c ../common/lex_yy.c $(WXDIR)/lib/libwx$(GUISUFFIX).a core
 

src/msw/notebook.cpp

@@ -161,7 +161,11 @@ bool wxNotebook::Create(wxWindow *parent,
     return FALSE;
   }
 
-  SetWindowFont((HWND)m_hwnd, ::GetStockObject(DEFAULT_GUI_FONT), FALSE);
+  // Not all compilers recognise SetWindowFont
+//  SetWindowFont((HWND)m_hwnd, ::GetStockObject(DEFAULT_GUI_FONT), FALSE);
+  ::SendMessage((HWND) m_hwnd, WM_SETFONT,
+                  (WPARAM)::GetStockObject(DEFAULT_GUI_FONT),TRUE);
+
 
   if ( parent != NULL ) 
     parent->AddChild(this);

src/msw/ole/droptgt.cpp

@@ -22,7 +22,6 @@
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
-#define IN_WX_MAIN_CPP
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)

src/msw/ole/oleutils.cpp

@@ -22,7 +22,6 @@
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
-#define IN_WX_MAIN_CPP
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)
@@ -30,8 +29,6 @@
 #endif
 
 #include  <wx/setup.h>
-
-
 #include  <wx/log.h>
 
 #include <windows.h>

src/msw/ole/uuid.cpp

@@ -18,7 +18,6 @@
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
-#define IN_WX_MAIN_CPP
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)

src/msw/penwin.cpp

@@ -14,7 +14,6 @@
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
-#define IN_WX_MAIN_CPP
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)

src/msw/printdlg.cpp

@@ -14,7 +14,6 @@
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
-#define IN_WX_MAIN_CPP
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)

src/msw/registry.cpp

@@ -12,6 +12,10 @@
 //              - add high level functions (RegisterOleServer, ...)
 ///////////////////////////////////////////////////////////////////////////////
 
+#ifdef __GNUG__
+#pragma implementation "registry.h"
+#endif
+
 // ============================================================================
 // declarations
 // ============================================================================

src/zlib/makefile.b32

@@ -85,8 +85,10 @@ example.obj: example.c zlib.h zconf.h
 minigzip.obj: minigzip.c zlib.h zconf.h
 	$(CC) -c $(CFLAGS) $*.c
 
+lib:    $(LIBTARGET)
+
 # we must cut the command line to fit in the MS/DOS 128 byte limit:
-$(LIBTARGET: $(OBJ1) $(OBJ2)
+$(LIBTARGET): $(OBJ1) $(OBJ2)
 	del $(LIBTARGET)
 	$(LIB) $(LIBTARGET) +$(OBJP1)
 	$(LIB) $(LIBTARGET) +$(OBJP2)

utils/dialoged/src/makefile.g95

@@ -40,16 +40,16 @@ dialoged$(GUISUFFIX)$(EXESUFF):	$(OBJECTS) $(WXLIB)
 $(OBJDIR)/dialoged.$(OBJSUFF):	dialoged.$(SRCSUFF)
 	$(CC) -c $(CPPFLAGS) -o $@ dialoged.$(SRCSUFF)
 
-$(OBJDIR)/winprop.$(OBJSUFF):	winprop.h reseditr.h editrpal.h winprop.$(SRCSUFF)
+$(OBJDIR)/winprop.$(OBJSUFF):	winprop.h reseditr.h winprop.$(SRCSUFF)
 	$(CC) -c $(CPPFLAGS) -o $@ winprop.$(SRCSUFF)
 
-$(OBJDIR)/reswrite.$(OBJSUFF):	winprop.h reseditr.h editrpal.h reswrite.$(SRCSUFF)
+$(OBJDIR)/reswrite.$(OBJSUFF):	winprop.h reseditr.h reswrite.$(SRCSUFF)
 	$(CC) -c $(CPPFLAGS) -o $@ reswrite.$(SRCSUFF)
 
-$(OBJDIR)/reseditr.$(OBJSUFF):	winprop.h reseditr.h editrpal.h reseditr.$(SRCSUFF)
+$(OBJDIR)/reseditr.$(OBJSUFF):	winprop.h reseditr.h reseditr.$(SRCSUFF)
 	$(CC) -c $(CPPFLAGS) -o $@ reseditr.$(SRCSUFF)
 
-$(OBJDIR)/dlghndlr.$(OBJSUFF):	winprop.h reseditr.h editrpal.h dlghndlr.$(SRCSUFF)
+$(OBJDIR)/dlghndlr.$(OBJSUFF):	winprop.h reseditr.h dlghndlr.$(SRCSUFF)
 	$(CC) -c $(CPPFLAGS) -o $@ dlghndlr.$(SRCSUFF)
 
 $(OBJDIR)/edlist.$(OBJSUFF):	winprop.h edlist.h edlist.$(SRCSUFF)
@@ -59,10 +59,10 @@ $(OBJDIR)/edtree.$(OBJSUFF):	winprop.h edtree.h edtree.$(SRCSUFF)
 	$(CC) -c $(CPPFLAGS) -o $@ edtree.$(SRCSUFF)
 
 $(OBJDIR)/winstyle.$(OBJSUFF):	winstyle.h winstyle.$(SRCSUFF)
-	$(CC) -c $(CPPFLAGS) -o $@ edtree.$(SRCSUFF)
+	$(CC) -c $(CPPFLAGS) -o $@ winstyle.$(SRCSUFF)
 
 $(OBJDIR)/symbtabl.$(OBJSUFF):	symbtabl.h symbtabl.$(SRCSUFF)
-	$(CC) -c $(CPPFLAGS) -o $@ edtree.$(SRCSUFF)
+	$(CC) -c $(CPPFLAGS) -o $@ symbtabl.$(SRCSUFF)
 
 $(OBJDIR)/dialoged_resources.o:  dialoged.rc
 	$(RESCOMP) -i dialoged.rc -o $(OBJDIR)/dialoged_resources.o $(RESFLAGS)