post wxUniv merge fixes

[wxWidgets.git] / samples / joytest / makefile.bcc

diff --git a/samples/joytest/makefile.bcc b/samples/joytest/makefile.bcc
index 230ea4abbeee66cb4e704a4421f8a539287e6cc8..51ff8dfd69a32281e92e628095c4547fd16a76f1 100644 (file)
--- a/samples/joytest/makefile.bcc
+++ b/samples/joytest/makefile.bcc
@@ -1,75 +1,14 @@
-#
-# File:                makefile.bcc
-# Author:      Julian Smart
-# Created:     1993
-# Updated:     
-# Copyright:   (c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile : Builds joytest example (DOS).
-
-!if "$(BCCDIR)" == ""
-!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
-!endif
+# Purpose: makefile for joytest example (BC++ 16bit)
+# Created: 2000-03-14
 
 !if "$(WXWIN)" == ""
 !error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
 !endif
 
-!ifndef FINAL
-FINAL=0
-!endif
-
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makebcc.env
-
-THISDIR = $(WXDIR)\samples\joytest
-WXLIB = $(WXDIR)\lib\wx.lib
-LIBS=$(WXLIB) mathwl cwl import
-INC=-I$(WXDIR)\include\base -I$(WXDIR)\include\msw
-CFG=$(WXDIR)\src\wxwin.cfg
-
-!if "$(FINAL)" == "0"
-LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -O2
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-HEADERS = joytest.h
-SOURCES = joytest.$(SRCSUFF)
-OBJECTS = joytest.obj
-
-joytest:    joytest.exe
-
-all:    joytest.exe
-
-joytest.exe:      $(WXLIB) joytest.obj joytest.def joytest.res
-        tlink $(LINKFLAGS) @&&!
-c0wl.obj joytest.obj
-joytest
-nul
-$(LIBS)
-joytest.def
-!
-        rc -30 -K joytest.res
-
-.$(SRCSUFF).obj:
-       bcc $(CPPFLAGS) -c {$< }
 
-joytest.obj:      joytest.$(SRCSUFF)
+TARGET=joytest
+OBJECTS=$(TARGET).obj
 
-joytest.res :      joytest.rc $(WXDIR)\include\msw\wx.rc
-    rc -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa joytest
+!include $(WXDIR)\src\makeprog.bcc
 
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws