Minor tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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 +)
|
||||
!
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -18,7 +18,7 @@ lib: $(LIBTARGET)
|
||||
|
||||
$(LIBTARGET): $(OBJECTS)
|
||||
-erase $(LIBTARGET)
|
||||
tlib $(LIBTARGET) /P512 @&&!
|
||||
tlib "$(LIBTARGET)" /P512 @&&!
|
||||
+$(OBJECTS:.obj =.obj +)
|
||||
!
|
||||
|
||||
|
@@ -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 +)
|
||||
!
|
||||
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user