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

Updated project and makefiles (VC++) to be more consistent.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-07-23 14:26:37 +00:00
parent ab1b83b633
commit 3f4983bf30
4 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,9 +79,6 @@ LIBTARGET=$(WXLIB)
DUMMYOBJ=$D\dummy.obj DUMMYOBJ=$D\dummy.obj
!endif !endif
# Please set these according to the settings in setup.h, so we can include
# the appropriate libraries in wx.lib
# This one overrides the others, to be consistent with the settings in setup.h # This one overrides the others, to be consistent with the settings in setup.h
MINIMAL_WXWINDOWS_SETUP=0 MINIMAL_WXWINDOWS_SETUP=0
@@ -89,6 +86,9 @@ PERIPH_LIBS=
PERIPH_TARGET= PERIPH_TARGET=
PERIPH_CLEAN_TARGET= PERIPH_CLEAN_TARGET=
# Set to 0 if not using GLCanvas (only affects DLL build)
USE_GLCANVAS=1
# These are absolute paths, so that the compiler # These are absolute paths, so that the compiler
# generates correct __FILE__ symbols for debugging. # generates correct __FILE__ symbols for debugging.
# Otherwise you don't be able to double-click on a memory # Otherwise you don't be able to double-click on a memory
@@ -235,6 +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
!endif !endif
# Update the dynamic link library # Update the dynamic link library
@@ -246,7 +247,7 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
delayimp.lib delayimp.lib
/delayload:ws2_32.dll /delayload:advapi32.dll /delayload:user32.dll /delayload:gdi32.dll /delayload:ws2_32.dll /delayload:advapi32.dll /delayload:user32.dll /delayload:gdi32.dll
/delayload:comdlg32.dll /delayload:shell32.dll /delayload:comctl32.dll /delayload:ole32.dll /delayload:comdlg32.dll /delayload:shell32.dll /delayload:comctl32.dll /delayload:ole32.dll
/delayload:oleaut32.dll /delayload:rpcrt4.dll /delayload:winmm.dll /delayload:opengl32.dll /delayload:oleaut32.dll /delayload:rpcrt4.dll /delayload:winmm.dll $(GL_LIBS_DELAY)
<< <<
!endif !endif

5
src/makevc.env
View File

@@ -140,7 +140,12 @@ D=$(D)DLL
WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
INC=-I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/tiff $(EXTRAINC) INC=-I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/tiff $(EXTRAINC)
!if "$(WXUSINGDLL)" == "1"
LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS)
!else
LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib $(WXDIR)\lib\xpm$(LIBEXT).lib LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib $(WXDIR)\lib\xpm$(LIBEXT).lib
!endif
MAKEPRECOMP=/YcWX/WXPREC.H MAKEPRECOMP=/YcWX/WXPREC.H
OPTIONS= OPTIONS=

13
src/msw/makefile.vc
View File

@@ -27,16 +27,13 @@ LIBTARGET=$(WXLIB)
DUMMYOBJ=$D\dummy.obj DUMMYOBJ=$D\dummy.obj
!endif !endif
# Please set these according to the settings in setup.h, so we can include
# the appropriate libraries in wx.lib
# This one overrides the others, to be consistent with the settings in setup.h
MINIMAL_WXWINDOWS_SETUP=0
PERIPH_LIBS= PERIPH_LIBS=
PERIPH_TARGET= PERIPH_TARGET=
PERIPH_CLEAN_TARGET= PERIPH_CLEAN_TARGET=
# Set to 0 if not using GLCanvas (only affects DLL build)
USE_GLCANVAS=1
# These are absolute paths, so that the compiler # These are absolute paths, so that the compiler
# generates correct __FILE__ symbols for debugging. # generates correct __FILE__ symbols for debugging.
# Otherwise you don't be able to double-click on a memory # Otherwise you don't be able to double-click on a memory
@@ -441,6 +438,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
!endif !endif
# Update the dynamic link library # Update the dynamic link library
@@ -452,12 +450,11 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
delayimp.lib delayimp.lib
/delayload:ws2_32.dll /delayload:advapi32.dll /delayload:user32.dll /delayload:gdi32.dll /delayload:ws2_32.dll /delayload:advapi32.dll /delayload:user32.dll /delayload:gdi32.dll
/delayload:comdlg32.dll /delayload:shell32.dll /delayload:comctl32.dll /delayload:ole32.dll /delayload:comdlg32.dll /delayload:shell32.dll /delayload:comctl32.dll /delayload:ole32.dll
/delayload:oleaut32.dll /delayload:rpcrt4.dll /delayload:winmm.dll /delayload:opengl32.dll /delayload:oleaut32.dll /delayload:rpcrt4.dll /delayload:winmm.dll $(GL_LIBS_DELAY)
<< <<
!endif !endif
######################################################## ########################################################
# Windows-specific objects # Windows-specific objects

4
src/wxvc_dll.dsp
View File

@@ -53,7 +53,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"../lib/wxdll.dll" # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"../lib/wx22_0.dll"
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug" !ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"../lib/wxdlld.dll" /pdbtype:sept # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"../lib/wx22_0d.dll" /pdbtype:sept
!ENDIF !ENDIF