Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor tweaks

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-11-12 19:55:10 +00:00
parent 34cfc23c75
commit 20a2bdc9c3
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
distrib/msw/tmake/b32.t
View File

@@ -172,7 +172,7 @@ all: all_libs all_execs
$(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
-erase $(LIBTARGET) -erase $(LIBTARGET)
tlib $(LIBTARGET) /P1024 @&&! tlib "$(LIBTARGET)" /P1024 @&&!
+$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +) +$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
! !

2
distrib/msw/tmake/vc.t
View File

@@ -235,7 +235,7 @@ $(WXDIR)\lib\$(WXLIBNAME).lib: $(DUMMYOBJ) $(OBJECTS)
!if "$(USE_GLCANVAS)" == "1" !if "$(USE_GLCANVAS)" == "1"
GL_LIBS=opengl32.lib glu32.lib GL_LIBS=opengl32.lib glu32.lib
GL_LIBS_DELAY=/delayload:opengl32.dll # GL_LIBS_DELAY=/delayload:opengl32.dll
!endif !endif
# Update the dynamic link library # Update the dynamic link library

2
src/makelib.b32
View File

@@ -18,7 +18,7 @@ lib: $(LIBTARGET)
$(LIBTARGET): $(OBJECTS) $(LIBTARGET): $(OBJECTS)
-erase $(LIBTARGET) -erase $(LIBTARGET)
tlib $(LIBTARGET) /P512 @&&! tlib "$(LIBTARGET)" /P512 @&&!
+$(OBJECTS:.obj =.obj +) +$(OBJECTS:.obj =.obj +)
! !

2
src/msw/makefile.b32
View File

@@ -359,7 +359,7 @@ all: all_libs all_execs
$(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
-erase $(LIBTARGET) -erase $(LIBTARGET)
tlib $(LIBTARGET) /P1024 @&&! tlib "$(LIBTARGET)" /P1024 @&&!
+$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +) +$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
! !

2
src/msw/makefile.vc
View File

@@ -448,7 +448,7 @@ $(WXDIR)\lib\$(WXLIBNAME).lib: $(DUMMYOBJ) $(OBJECTS)
!if "$(USE_GLCANVAS)" == "1" !if "$(USE_GLCANVAS)" == "1"
GL_LIBS=opengl32.lib glu32.lib GL_LIBS=opengl32.lib glu32.lib
GL_LIBS_DELAY=/delayload:opengl32.dll # GL_LIBS_DELAY=/delayload:opengl32.dll
!endif !endif
# Update the dynamic link library # Update the dynamic link library