From 20a2bdc9c3abad3e4634f95282da6a8a6bc88c45 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sun, 12 Nov 2000 19:55:10 +0000 Subject: [PATCH] Minor tweaks git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/tmake/b32.t | 2 +- distrib/msw/tmake/vc.t | 2 +- src/makelib.b32 | 2 +- src/msw/makefile.b32 | 2 +- src/msw/makefile.vc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/distrib/msw/tmake/b32.t b/distrib/msw/tmake/b32.t index a701f3c2be..37f85b10dc 100644 --- a/distrib/msw/tmake/b32.t +++ b/distrib/msw/tmake/b32.t @@ -172,7 +172,7 @@ all: all_libs all_execs $(LIBTARGET): $(DUMMY).obj $(OBJECTS) -erase $(LIBTARGET) - tlib $(LIBTARGET) /P1024 @&&! + tlib "$(LIBTARGET)" /P1024 @&&! +$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +) ! diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t index 637de7f22a..f1ebfbe598 100644 --- a/distrib/msw/tmake/vc.t +++ b/distrib/msw/tmake/vc.t @@ -235,7 +235,7 @@ $(WXDIR)\lib\$(WXLIBNAME).lib: $(DUMMYOBJ) $(OBJECTS) !if "$(USE_GLCANVAS)" == "1" GL_LIBS=opengl32.lib glu32.lib -GL_LIBS_DELAY=/delayload:opengl32.dll +# GL_LIBS_DELAY=/delayload:opengl32.dll !endif # Update the dynamic link library diff --git a/src/makelib.b32 b/src/makelib.b32 index 75b13ead1b..fdb8d19d09 100644 --- a/src/makelib.b32 +++ b/src/makelib.b32 @@ -18,7 +18,7 @@ lib: $(LIBTARGET) $(LIBTARGET): $(OBJECTS) -erase $(LIBTARGET) - tlib $(LIBTARGET) /P512 @&&! + tlib "$(LIBTARGET)" /P512 @&&! +$(OBJECTS:.obj =.obj +) ! diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index 3e2c329a81..1c807cec3c 100644 --- a/src/msw/makefile.b32 +++ b/src/msw/makefile.b32 @@ -359,7 +359,7 @@ all: all_libs all_execs $(LIBTARGET): $(DUMMY).obj $(OBJECTS) -erase $(LIBTARGET) - tlib $(LIBTARGET) /P1024 @&&! + tlib "$(LIBTARGET)" /P1024 @&&! +$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +) ! diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index d31e75f139..5e55d05322 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -448,7 +448,7 @@ $(WXDIR)\lib\$(WXLIBNAME).lib: $(DUMMYOBJ) $(OBJECTS) !if "$(USE_GLCANVAS)" == "1" GL_LIBS=opengl32.lib glu32.lib -GL_LIBS_DELAY=/delayload:opengl32.dll +# GL_LIBS_DELAY=/delayload:opengl32.dll !endif # Update the dynamic link library -- 2.45.2