Minor tweaks

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

diff --git a/distrib/msw/tmake/b32.t b/distrib/msw/tmake/b32.t
index a701f3c2be810b15e8b58ec9609e3fcd54313e1f..37f85b10dcb2b987164887e8e5a21ac3eafa055a 100644 (file)
--- 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)
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
         -erase $(LIBTARGET)

-       tlib $(LIBTARGET) /P1024 @&&!
+       tlib "$(LIBTARGET)" /P1024 @&&!

 +$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
 !
 
 +$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
 !
 

diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t
index 637de7f22a013b7444b33cbd895897da1d2cb250..f1ebfbe598cc83d1fd93fecdc3bd13d9f8da22f4 100644 (file)
--- 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
 
 !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
 !endif
 
 # Update the dynamic link library

diff --git a/src/makelib.b32 b/src/makelib.b32
index 75b13ead1b2fea67802c5e333c2a855c0d47de10..fdb8d19d0962a2d6ee072b1fca88dabf138669e5 100644 (file)
--- a/src/makelib.b32
+++ b/src/makelib.b32
@@ -18,7 +18,7 @@ lib: $(LIBTARGET)
    
 $(LIBTARGET): $(OBJECTS)
    -erase $(LIBTARGET)
    
 $(LIBTARGET): $(OBJECTS)
    -erase $(LIBTARGET)

-   tlib $(LIBTARGET) /P512 @&&!
+   tlib "$(LIBTARGET)" /P512 @&&!

 +$(OBJECTS:.obj =.obj +)
 !
 
 +$(OBJECTS:.obj =.obj +)
 !
 

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 3e2c329a811c3f6bd46f61faceeb5cd8c22da0f6..1c807cec3cb44acf7ae1728b72e8b015a105c5a5 100644 (file)
--- 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)
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
         -erase $(LIBTARGET)

-       tlib $(LIBTARGET) /P1024 @&&!
+       tlib "$(LIBTARGET)" /P1024 @&&!

 +$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
 !
 
 +$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
 !
 

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index d31e75f13912e6170284b7420f253872f988355e..5e55d0532286ab44accab7f6709b0b48d8a46af9 100644 (file)
--- 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
 
 !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
 !endif
 
 # Update the dynamic link library