Removal of old src/msw/ctl3d files

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

diff --git a/src/msw/ctl3d/borland/makefile.b32 b/src/msw/ctl3d/borland/makefile.b32
deleted file mode 100644 (file)
index 1783689..0000000
--- a/src/msw/ctl3d/borland/makefile.b32
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# File:                makefile.b32
-# Author:       Andre Beltman
-# Created:     1995
-# Updated:     
-# Copyright:    (c) 1995, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile : Imports 32bit ctl3d library for Windows 95
-# and Borland C++ 4.x
-
-WXDIR = $(WXWIN)
-WXLIB = $(WXDIR)\lib
-
-LIBTARGET= $(WXLIB)\ctl3d32.lib
-
-all:    $(LIBTARGET)
-
-$(LIBTARGET):
-       erase $(LIBTARGET)
-        implib $(LIBTARGET) ..\ctl3d32.dll
-
-clean:
-        -erase $(LIBTARGET)

diff --git a/src/msw/ctl3d/borland/makefile.bcc b/src/msw/ctl3d/borland/makefile.bcc
deleted file mode 100644 (file)
index 6a0bcdb..0000000
--- a/src/msw/ctl3d/borland/makefile.bcc
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# File:                makefile.b32
-# Author:       Andre Beltman
-# Created:     1995
-# Updated:     
-# Copyright:    (c) 1995, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile : Imports ctl3d library
-# and Borland C++ 4.x
-
-WXDIR = $(WXWIN)
-WXLIB = $(WXDIR)\lib
-
-LIBTARGET= $(WXLIB)\ctl3dv2.lib
-
-all:    $(LIBTARGET)
-
-$(LIBTARGET):
-       erase $(LIBTARGET)
-        implib $(LIBTARGET) ..\ctl3dv2.dll
-
-clean:
-        -erase $(LIBTARGET)

diff --git a/src/msw/ctl3d/ctl3d.dll b/src/msw/ctl3d/ctl3d.dll
deleted file mode 100644 (file)
index 8e1b74c..0000000
Binary files a/src/msw/ctl3d/ctl3d.dll and /dev/null differ

diff --git a/src/msw/ctl3d/ctl3d32.dll b/src/msw/ctl3d/ctl3d32.dll
deleted file mode 100644 (file)
index fc21268..0000000
Binary files a/src/msw/ctl3d/ctl3d32.dll and /dev/null differ

diff --git a/src/msw/ctl3d/ctl3dv2.dll b/src/msw/ctl3d/ctl3dv2.dll
deleted file mode 100644 (file)
index 1799fd9..0000000
Binary files a/src/msw/ctl3d/ctl3dv2.dll and /dev/null differ

diff --git a/src/msw/ctl3d/msvc/ctl3d.h b/src/msw/ctl3d/msvc/ctl3d.h
deleted file mode 100644 (file)
index de7e67a..0000000
--- a/src/msw/ctl3d/msvc/ctl3d.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-----------------------------------------------------------------------
-|      CTL3D.DLL
-|      
-|      Adds 3d effects to Windows controls
-|
-|      See ctl3d.doc for info
-|              
------------------------------------------------------------------------*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-BOOL WINAPI Ctl3dSubclassDlg(HWND, WORD);
-BOOL WINAPI Ctl3dSubclassDlgEx(HWND, DWORD);
-WORD WINAPI Ctl3dGetVer(void);
-BOOL WINAPI Ctl3dEnabled(void);
-HBRUSH WINAPI Ctl3dCtlColor(HDC, LONG);        // ARCHAIC, use Ctl3dCtlColorEx
-HBRUSH WINAPI Ctl3dCtlColorEx(UINT wm, WPARAM wParam, LPARAM lParam);
-BOOL WINAPI Ctl3dColorChange(void);
-BOOL WINAPI Ctl3dSubclassCtl(HWND);
-LONG WINAPI Ctl3dDlgFramePaint(HWND, UINT, WPARAM, LPARAM);
-
-BOOL WINAPI Ctl3dAutoSubclass(HANDLE);
-
-BOOL WINAPI Ctl3dRegister(HANDLE);
-BOOL WINAPI Ctl3dUnregister(HANDLE);
-
-//begin DBCS: far east short cut key support
-VOID WINAPI Ctl3dWinIniChange(void);
-//end DBCS
-
-
-/* Ctl3dSubclassDlg3d flags */
-#define CTL3D_BUTTONS          0x0001
-#define CTL3D_LISTBOXES                0x0002          
-#define CTL3D_EDITS                    0x0004  
-#define CTL3D_COMBOS                   0x0008          
-#define CTL3D_STATICTEXTS      0x0010          
-#define CTL3D_STATICFRAMES     0x0020
-
-#define CTL3D_NODLGWINDOW       0x00010000
-#define CTL3D_ALL                              0xffff
-
-#define WM_DLGBORDER (WM_USER+3567)
-/* WM_DLGBORDER *(int FAR *)lParam return codes */
-#define CTL3D_NOBORDER         0
-#define CTL3D_BORDER                   1
-
-#define WM_DLGSUBCLASS (WM_USER+3568)
-/* WM_DLGSUBCLASS *(int FAR *)lParam return codes */
-#define CTL3D_NOSUBCLASS       0
-#define CTL3D_SUBCLASS         1
-
-/* Resource ID for 3dcheck.bmp (for .lib version of ctl3d) */
-#define CTL3D_3DCHECK 26567
-
-
-#ifdef __cplusplus
-}
-#endif

diff --git a/src/msw/ctl3d/msvc/ctl3d.lib b/src/msw/ctl3d/msvc/ctl3d.lib
deleted file mode 100644 (file)
index 3fe7168..0000000
Binary files a/src/msw/ctl3d/msvc/ctl3d.lib and /dev/null differ

diff --git a/src/msw/ctl3d/msvc/ctl3dv2.lib b/src/msw/ctl3d/msvc/ctl3dv2.lib
deleted file mode 100644 (file)
index 8e35c80..0000000
Binary files a/src/msw/ctl3d/msvc/ctl3dv2.lib and /dev/null differ

diff --git a/src/msw/ctl3d/readme.txt b/src/msw/ctl3d/readme.txt
deleted file mode 100644 (file)
index 58c656b..0000000
--- a/src/msw/ctl3d/readme.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-
-CTL3D
------
-
-CTL3D gives 3D controls to 16-bit Windows 3.1 applications.
-Its use in wxWindows is controlled by the CTL3D symbol
-in include/base/wx_setup.h.
-
-If using a 16-bit compiler, copy ctl3dv2.lib to your compiler
-library directory, and remember to distribute ctl3dv2.dll
-with your applications. The DLL should be copied to
-windows/system and DELETED from the application installation
-directory.
-
-If using Watcom C++ in 386 mode, things are slightly more complex: you need
-to link with Patrick Halke's ctl3d32.obj which provides an interface
-from 32-bits to the 16-bit CTL3DV2 library. Link your application
-with ctl3d32.obj file instead of ctl3dv2.lib, distributing
-ctl3dv2.dll as above.
-
-ctl3d.dll           ; Version 1 of the CTL3D library DLL: obsolete
-ctl3dv2.dll         ; Version 2 of the CTL3D library DLL
-readme.txt          ; This file
-
-msvc/ctl3d.h        ; Header file for either version of CTL3D
-msvc/ctl3d.lib      ; Import library for 16-bit compilers
-watcom/import32.zip ; Import libraries for Watcom WIN32 compilation
-wat386/             ; Source & objects for Watcom 386 object file to
-                    ; interface 16<->32 bit modes
-borland/            ; Makefiles for making import libraries for Borland
-

diff --git a/src/msw/ctl3d/wat32/import32.zip b/src/msw/ctl3d/wat32/import32.zip
deleted file mode 100644 (file)
index ca98307..0000000
Binary files a/src/msw/ctl3d/wat32/import32.zip and /dev/null differ

diff --git a/src/msw/ctl3d/wat386/ctl3d.h b/src/msw/ctl3d/wat386/ctl3d.h
deleted file mode 100644 (file)
index de7e67a..0000000
--- a/src/msw/ctl3d/wat386/ctl3d.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-----------------------------------------------------------------------
-|      CTL3D.DLL
-|      
-|      Adds 3d effects to Windows controls
-|
-|      See ctl3d.doc for info
-|              
------------------------------------------------------------------------*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-BOOL WINAPI Ctl3dSubclassDlg(HWND, WORD);
-BOOL WINAPI Ctl3dSubclassDlgEx(HWND, DWORD);
-WORD WINAPI Ctl3dGetVer(void);
-BOOL WINAPI Ctl3dEnabled(void);
-HBRUSH WINAPI Ctl3dCtlColor(HDC, LONG);        // ARCHAIC, use Ctl3dCtlColorEx
-HBRUSH WINAPI Ctl3dCtlColorEx(UINT wm, WPARAM wParam, LPARAM lParam);
-BOOL WINAPI Ctl3dColorChange(void);
-BOOL WINAPI Ctl3dSubclassCtl(HWND);
-LONG WINAPI Ctl3dDlgFramePaint(HWND, UINT, WPARAM, LPARAM);
-
-BOOL WINAPI Ctl3dAutoSubclass(HANDLE);
-
-BOOL WINAPI Ctl3dRegister(HANDLE);
-BOOL WINAPI Ctl3dUnregister(HANDLE);
-
-//begin DBCS: far east short cut key support
-VOID WINAPI Ctl3dWinIniChange(void);
-//end DBCS
-
-
-/* Ctl3dSubclassDlg3d flags */
-#define CTL3D_BUTTONS          0x0001
-#define CTL3D_LISTBOXES                0x0002          
-#define CTL3D_EDITS                    0x0004  
-#define CTL3D_COMBOS                   0x0008          
-#define CTL3D_STATICTEXTS      0x0010          
-#define CTL3D_STATICFRAMES     0x0020
-
-#define CTL3D_NODLGWINDOW       0x00010000
-#define CTL3D_ALL                              0xffff
-
-#define WM_DLGBORDER (WM_USER+3567)
-/* WM_DLGBORDER *(int FAR *)lParam return codes */
-#define CTL3D_NOBORDER         0
-#define CTL3D_BORDER                   1
-
-#define WM_DLGSUBCLASS (WM_USER+3568)
-/* WM_DLGSUBCLASS *(int FAR *)lParam return codes */
-#define CTL3D_NOSUBCLASS       0
-#define CTL3D_SUBCLASS         1
-
-/* Resource ID for 3dcheck.bmp (for .lib version of ctl3d) */
-#define CTL3D_3DCHECK 26567
-
-
-#ifdef __cplusplus
-}
-#endif

diff --git a/src/msw/ctl3d/wat386/ctl3d32.c b/src/msw/ctl3d/wat386/ctl3d32.c
deleted file mode 100644 (file)
index 67f8450..0000000
--- a/src/msw/ctl3d/wat386/ctl3d32.c
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * File:       ctl3d32.c
- * Purpose:    32bit interface to CTL3D functions for Watcom C/C++
- * Author:     Patrick Halke
- * Created:    1995
- * Updated:    
- * Copyright:  (c) 1995
- */
-
-#include <malloc.h>
-
-#include <windows.h>
-
-#include "ctl3d.h"
-
-#if defined(__WINDOWS_386__)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#undef FAR
-#define FAR
-
-#define INDIR_INT INDIR_WORD
-#define INDIR_UINT INDIR_WORD
-#define INDIR_WPARAM INDIR_UINT
-#define INDIR_LPARAM INDIR_DWORD
-#define INDIR_LONG INDIR_DWORD
-#define INDIR_ULONG INDIR_DWORD
-
-#ifdef STRICT
-#define INDIR_HANDLE INDIR_PTR
-#define INDIR_HWND INDIR_PTR
-#define INDIR_HDC INDIR_PTR
-#else
-#define INDIR_HANDLE INDIR_UINT
-#define INDIR_HWND INDIR_UINT
-#define INDIR_HDC INDIR_UINT
-#endif
-
-typedef struct tagCTL3DFUNCTIONS {
-    HINSTANCE  dll;
-    /* Function Handles */
-    HINDIR     _Ctl3dSubclassDlg;
-    HINDIR     _Ctl3dSubclassDlgEx;
-    HINDIR     _Ctl3dGetVer;
-    HINDIR     _Ctl3dEnabled;
-    HINDIR     _Ctl3dCtlColor;
-    HINDIR     _Ctl3dCtlColorEx;
-    HINDIR     _Ctl3dColorChange;
-    HINDIR     _Ctl3dSubclassCtl;
-    HINDIR     _Ctl3dDlgFramePaint;
-    HINDIR     _Ctl3dAutoSubclass;
-    HINDIR     _Ctl3dRegister;
-    HINDIR     _Ctl3dUnregister;
-    HINDIR     _Ctl3dWinIniChange;
-} CTL3DFUNCTIONS;
-
-static CTL3DFUNCTIONS  Ctl3dFunc = { 0 };
-
-static BOOL load_functions( CTL3DFUNCTIONS* functions )
-{
-    FARPROC            proc;
-    HINSTANCE          dll;
-
-    dll = LoadLibrary( "CTL3D.DLL" );
-    if( dll < HINSTANCE_ERROR ) {
-       return( FALSE );
-    }
-
-    /* Function thunks */
-    
-    proc = GetProcAddress(dll, "Ctl3dSubclassDlg");
-    functions->_Ctl3dSubclassDlg = GetIndirectFunctionHandle( proc,
-       INDIR_HWND,
-       INDIR_WORD,
-       INDIR_ENDLIST );
-    
-    proc = GetProcAddress( dll, "Ctl3dSubclassDlgEx" );
-    functions->_Ctl3dSubclassDlgEx = GetIndirectFunctionHandle( proc,
-       INDIR_HWND,
-       INDIR_DWORD,
-       INDIR_ENDLIST );
-    
-    proc = GetProcAddress( dll, "Ctl3dGetVer" );
-    functions->_Ctl3dGetVer = GetIndirectFunctionHandle( proc,
-       INDIR_ENDLIST );
-    
-    proc = GetProcAddress( dll, "Ctl3dEnabled" );
-    functions->_Ctl3dEnabled = GetIndirectFunctionHandle( proc,
-       INDIR_ENDLIST );
-    
-    proc = GetProcAddress( dll, "Ctl3dCtlColor" );
-    functions->_Ctl3dCtlColor = GetIndirectFunctionHandle( proc,
-       INDIR_HDC,
-       INDIR_LONG,
-       INDIR_ENDLIST );
-    
-    proc = GetProcAddress( dll, "Ctl3dCtlColorEx" );
-    functions->_Ctl3dCtlColorEx = GetIndirectFunctionHandle( proc,
-       INDIR_UINT,
-       INDIR_WPARAM,
-       INDIR_LPARAM,
-       INDIR_ENDLIST );
-
-    proc = GetProcAddress( dll, "Ctl3dColorChange" );
-    functions->_Ctl3dColorChange = GetIndirectFunctionHandle( proc,
-       INDIR_ENDLIST );
-
-    proc = GetProcAddress( dll, "Ctl3dSubclassCtl" );
-    functions->_Ctl3dSubclassCtl = GetIndirectFunctionHandle( proc,
-       INDIR_HWND,
-       INDIR_ENDLIST );
-  
-    proc = GetProcAddress( dll, "Ctl3dDlgFramePaint" );
-    functions->_Ctl3dDlgFramePaint = GetIndirectFunctionHandle( proc,
-       INDIR_HWND,
-       INDIR_UINT,
-       INDIR_WPARAM,
-       INDIR_LPARAM,
-       INDIR_ENDLIST );
-  
-    proc = GetProcAddress( dll, "Ctl3dAutoSubclass" );
-    functions->_Ctl3dAutoSubclass = GetIndirectFunctionHandle( proc,
-       INDIR_HANDLE,
-       INDIR_ENDLIST );
-  
-    proc = GetProcAddress( dll, "Ctl3dRegister" );
-    functions->_Ctl3dRegister = GetIndirectFunctionHandle( proc,
-       INDIR_HANDLE,
-       INDIR_ENDLIST );
-  
-    proc = GetProcAddress( dll, "Ctl3dUnregister" );
-    functions->_Ctl3dUnregister = GetIndirectFunctionHandle( proc,
-       INDIR_HANDLE,
-       INDIR_ENDLIST );
-  
-    proc = GetProcAddress( dll, "Ctl3dWinIniChange" );
-    functions->_Ctl3dWinIniChange = GetIndirectFunctionHandle( proc,
-       INDIR_ENDLIST );
-
-    functions->dll = dll;
-    return( TRUE );
-}
-
-static void unload_functions( CTL3DFUNCTIONS * functions )
-{
-    FreeLibrary( functions->dll );
-    functions->dll = 0;
-}
-
-/* Function Definitions */
-
-BOOL WINAPI Ctl3dSubclassDlg(HWND hwnd, WORD w)
-{
-  if (!Ctl3dFunc.dll)
-    if (!load_functions(&Ctl3dFunc))
-    return FALSE;
-  
-  return (BOOL)InvokeIndirectFunction(Ctl3dFunc._Ctl3dSubclassDlg,
-                                     hwnd, w);
-}
-
-BOOL WINAPI Ctl3dSubclassDlgEx(HWND hwnd, DWORD dw)
-{
-  if (!Ctl3dFunc.dll)
-    if (!load_functions(&Ctl3dFunc))
-    return FALSE;
-  
-  return (BOOL)InvokeIndirectFunction(Ctl3dFunc._Ctl3dSubclassDlgEx,
-                                     hwnd, dw);
-}
-
-WORD WINAPI Ctl3dGetVer(void)
-{
-  if (!Ctl3dFunc.dll)
-    if (!load_functions(&Ctl3dFunc))
-      return FALSE;
-  
-  return (WORD)InvokeIndirectFunction(Ctl3dFunc._Ctl3dGetVer);
-}
-
-BOOL WINAPI Ctl3dEnabled(void)
-{
-  if (!Ctl3dFunc.dll)
-    if (!load_functions(&Ctl3dFunc))
-      return FALSE;
-  
-  return (BOOL)InvokeIndirectFunction(Ctl3dFunc._Ctl3dEnabled);
-}
-
-HBRUSH WINAPI Ctl3dCtlColor(HDC hdc, LONG l)
-{
-  if (!Ctl3dFunc.dll)
-    if (!load_functions(&Ctl3dFunc))
-    return FALSE;
-  
-  return (HBRUSH)InvokeIndirectFunction(Ctl3dFunc._Ctl3dCtlColor,
-                                       hdc, l);
-}
-
-HBRUSH WINAPI Ctl3dCtlColorEx(UINT ui, WPARAM wp, LPARAM lp)
-{
-  if (!Ctl3dFunc.dll)
-    if (!load_functions(&Ctl3dFunc))
-    return FALSE;
-  
-  return (HBRUSH)InvokeIndirectFunction(Ctl3dFunc._Ctl3dCtlColorEx,
-                                       ui, wp, lp);
-}
-
-BOOL WINAPI Ctl3dColorChange(void)
-{
-  if (!Ctl3dFunc.dll)
-    if (!load_functions(&Ctl3dFunc))
-    return FALSE;
-  
-  return (BOOL)InvokeIndirectFunction(Ctl3dFunc._Ctl3dColorChange);
-}
-
-BOOL WINAPI Ctl3dSubclassCtl(HWND hwnd)
-{
-  if (!Ctl3dFunc.dll)
-    if (!load_functions(&Ctl3dFunc))
-    return FALSE;
-  
-  return (BOOL)InvokeIndirectFunction(Ctl3dFunc._Ctl3dSubclassCtl,
-                                     hwnd);
-}
-
-LONG WINAPI Ctl3dDlgFramePaint(HWND hwnd, UINT ui, WPARAM wp, LPARAM lp)
-{
-  if (!Ctl3dFunc.dll)
-    if (!load_functions(&Ctl3dFunc))
-    return FALSE;
-  
-  return (LONG)InvokeIndirectFunction(Ctl3dFunc._Ctl3dDlgFramePaint,
-                                     hwnd, ui, wp, lp);
-}
-
-BOOL WINAPI Ctl3dAutoSubclass(HANDLE hnd)
-{
-  if (!Ctl3dFunc.dll)
-    if (!load_functions(&Ctl3dFunc))
-    return FALSE;
-  
-  return (BOOL)InvokeIndirectFunction(Ctl3dFunc._Ctl3dAutoSubclass,
-                                     hnd);
-}
-
-BOOL WINAPI Ctl3dRegister(HANDLE hnd)
-{
-  if (!Ctl3dFunc.dll)
-    if (!load_functions(&Ctl3dFunc))
-    return FALSE;
-  
-  return (BOOL)InvokeIndirectFunction(Ctl3dFunc._Ctl3dRegister,
-                                     hnd);
-}
-
-BOOL WINAPI Ctl3dUnregister(HANDLE hnd)
-{
-  if (!Ctl3dFunc.dll)
-    if (!load_functions(&Ctl3dFunc))
-    return FALSE;
-  
-  return (BOOL)InvokeIndirectFunction(Ctl3dFunc._Ctl3dUnregister,
-                                     hnd);
-}
-
-VOID WINAPI Ctl3dWinIniChange(void)
-{
-  if (!Ctl3dFunc.dll)
-    if (!load_functions(&Ctl3dFunc))
-      return;
-  
-  InvokeIndirectFunction(Ctl3dFunc._Ctl3dWinIniChange);
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // __WINDOWS_386__

diff --git a/src/msw/ctl3d/wat386/ctl3d32.lnk b/src/msw/ctl3d/wat386/ctl3d32.lnk
deleted file mode 100644 (file)
index 2ada8d2..0000000
--- a/src/msw/ctl3d/wat386/ctl3d32.lnk
+++ /dev/null
@@ -1 +0,0 @@
-+-ctl3d32.obj

diff --git a/src/msw/ctl3d/wat386/ctl3d32.obj b/src/msw/ctl3d/wat386/ctl3d32.obj
deleted file mode 100644 (file)
index 11c6660..0000000
Binary files a/src/msw/ctl3d/wat386/ctl3d32.obj and /dev/null differ

diff --git a/src/msw/ctl3d/wat386/ctl3d32.txt b/src/msw/ctl3d/wat386/ctl3d32.txt
deleted file mode 100644 (file)
index 8e6b8b6..0000000
--- a/src/msw/ctl3d/wat386/ctl3d32.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Using this package should be no big problem. You only need to change your
-wx_setup.h for including the CTL3D stuff, compile ctl3d32.c and add
-ctl3d32.obj to wx.lib (or just link it with your application).
-
-Please send bug reports to 'patrick@zaphod.ruhr.de'.
-
-
-Good luck
-
-- patrick
-

diff --git a/src/msw/ctl3d/wat386/makefile.wat b/src/msw/ctl3d/wat386/makefile.wat
deleted file mode 100644 (file)
index 1f08584..0000000
--- a/src/msw/ctl3d/wat386/makefile.wat
+++ /dev/null
@@ -1,23 +0,0 @@
-CC     = wcc386
-CXX    = wpp386
-LIB     = wlib
-IFLAGS  = -i=..\\..\\include\\base;..\\..\\include\\msw
-CFLAGS  = $(IFLAGS) -zq -zW -w1 -d2 -ot -3 -dwx_msw
-
-WXDIR   = ..\\..
-LIBTARGET = $(WXDIR)\\lib\\wx.lib
-
-C_SRCS = ctl3d32.c
-
-OBJECTS = $(C_SRCS:.c=.obj) $(CC_SRCS:.cc=.obj)
-
-.c.obj:
-       $(CC) $(CFLAGS) $<
-
-.cc.obj:
-       $(CXX) $(CFLAGS) $< 
-
-all: $(OBJECTS) $(LIBTARGET)
-
-$(LIBTARGET): $(OBJECTS)
-       $(LIB) /P=256 $(LIBTARGET) @ctl3d32.lnk

diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index 961efc427dc00817139ca31a91b3df6c7fb21b91..67c9152640f44f16de225a6480b2225f0d9392bc 100644 (file)
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -47,7 +47,7 @@ PERIPH_TARGET=
 PERIPH_CLEAN_TARGET=
 
 !if "$(USE_CTL3D)" == "1"
-PERIPH_LIBS=$(BCCDIR)\lib\ctl3dv2.lib $(PERIPH_LIBS)
+PERIPH_LIBS=$(WXDIR)\lib\bcc16\ctl3dv2.lib $(PERIPH_LIBS)
 !endif
 
 !if "$(USE_XPM_IN_MSW)" == "1"
@@ -665,19 +665,14 @@ all_execs:
 
 all_libs:
     cd $(WXDIR)\src\msw
-    make -f makefile.bcc ctl3d dib fafa gauge hytext itsy prologio rcparser wx wxgraph\
+    make -f makefile.bcc dib fafa gauge hytext itsy prologio rcparser wx wxgraph\
           wxstring wxtree mfutils # wxxpm
 
 all_contribs:
     cd $(WXDIR)\src\msw
-    make -f makefile.bcc ctl3d fafa wxstring itsy gauge # wxxpm
+    make -f makefile.bcc fafa wxstring itsy gauge # wxxpm
 
 # CONTRIB
-ctl3d:  $(CFG)
-        cd $(WXDIR)\src\msw\ctl3d\borland
-        make -f makefile.bcc -DCFG=$(CFG)
-        cd $(WXDIR)\src\msw
-
 wxxpm: $(CFG)
        cd $(WXDIR)\src\xpm
        make -f makefile.bcc -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)