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

Take hard coded path out of makefile

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2000-01-17 20:22:34 +00:00
parent 981b25083e
commit 57e3f9d9cc
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/jpeg/MAKEFILE.VA
View File

@@ -13,13 +13,13 @@
OBJSUFF=obj OBJSUFF=obj
SRCSUFF=cpp SRCSUFF=cpp
OS2FLAGS=/c /W3 /DOS232 /D__VISAGECPP__ /D__WXPM__ /DJPEGLOCAL /Ss /Q /N100 OS2FLAGS=/c /W2 /DOS232 /D__VISAGECPP__ /D__WXPM__ /DJPEGLOCAL /Ss /Q /N100
OS2LINKFLAGS=/BASE:0x00010000 /PMTYPE:PM /NOE /NOD /ALIGN:16 OS2LINKFLAGS=/BASE:0x00010000 /PMTYPE:PM /NOE /NOD /ALIGN:16
OS2LIBFLAGS=/NOL /NOE OS2LIBFLAGS=/NOL /NOE
OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB
# Change WXDIR or WXWIN to wherever wxWindows is found # Change WXDIR or WXWIN to wherever wxWindows is found
WXDIR = j:\dev\wx2\wxWindows WXDIR = $(WXWIN)
OS2JPEGDIR=$(WXDIR)\src\jpeg OS2JPEGDIR=$(WXDIR)\src\jpeg
OS2JPEGINC=$(WINJPEGDIR) OS2JPEGINC=$(WINJPEGDIR)
@@ -44,7 +44,7 @@ MAKEPRECOMP=/Fi$(PCH)
!endif !endif
!if "$(FINAL)" == "0" !if "$(FINAL)" == "0"
D=Debug D=DebugOS2
OPT = OPT =
DEBUG_FLAGS= /Ti /D__WXDEBUG__ #/Fb DEBUG_FLAGS= /Ti /D__WXDEBUG__ #/Fb
LINK_DEBUG_FLAGS=/DEBUG LINK_DEBUG_FLAGS=/DEBUG
@@ -52,7 +52,7 @@ CRTFLAG=/Gm /Gd
!else !else
# /O1 - smallest code # /O1 - smallest code
# /O2 - fastest code # /O2 - fastest code
D=Release D=RelseOS2
OPT = /O+ /Oc /G5 OPT = /O+ /Oc /G5
DEBUG_FLAGS= DEBUG_FLAGS=
LINK_DEBUG_FLAGS=/RELEASE LINK_DEBUG_FLAGS=/RELEASE

4
src/makeprog.va
View File

@@ -10,8 +10,8 @@
# Use FINAL=1 argument to nmake to build final version with no debugging # Use FINAL=1 argument to nmake to build final version with no debugging
# info # info
# Set WXDIR for your system # Set and environment variable to point to WXDIR for your system
WXDIR = j:\dev\wx2\wxWindows WXDIR = $(WXWIN)
WXUSINGDLL=0 WXUSINGDLL=0

4
src/makeva.env
View File

@@ -15,8 +15,8 @@ OS2FLAGS=/c /W3 /D__VISAGECPP__ /Ss /Q /N100
OS2LINKFLAGS=/BASE:0x00010000 /PMTYPE:PM /NOE /NOD /ALIGN:16 OS2LINKFLAGS=/BASE:0x00010000 /PMTYPE:PM /NOE /NOD /ALIGN:16
OS2LIBFLAGS=/NOL /NOE OS2LIBFLAGS=/NOL /NOE
# Change this to your WXWIN directory # Set an environment variable, WXWIN, to your WXWIN directory
WXDIR=j:\dev\Wx2\wxwindows WXDIR=$(WXWIN)
WXSRC=$(WXDIR)\src\os2 WXSRC=$(WXDIR)\src\os2
WXINC=$(WXDIR)\include WXINC=$(WXDIR)\include

8
src/png/MAKEFILE.VA
View File

@@ -13,13 +13,13 @@
OBJSUFF=obj OBJSUFF=obj
SRCSUFF=cpp SRCSUFF=cpp
OS2FLAGS=/c /W3 /DOS232 /D__VISAGECPP__ /Ss /Q /N100 OS2FLAGS=/c /W2 /DOS232 /D__VISAGECPP__ /Ss /Q /N100
OS2LINKFLAGS=/BASE:0x00010000 /PMTYPE:PM /NOE /NOD /ALIGN:16 OS2LINKFLAGS=/BASE:0x00010000 /PMTYPE:PM /NOE /NOD /ALIGN:16
OS2LIBFLAGS=/NOL /NOE OS2LIBFLAGS=/NOL /NOE
OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB
# Change WXDIR or WXWIN to wherever wxWindows is found # Change WXDIR or WXWIN to wherever wxWindows is found
WXDIR = j:\dev\wx2\wxWindows WXDIR = $(WXWIN)
OS2PNGDIR=$(WXDIR)\src\png OS2PNGDIR=$(WXDIR)\src\png
OS2PNGINC=$(WINPNGDIR) OS2PNGINC=$(WINPNGDIR)
@@ -42,7 +42,7 @@ MAKEPRECOMP=/Fi$(PCH)
!endif !endif
!if "$(FINAL)" == "0" !if "$(FINAL)" == "0"
D=Debug D=DebugOS2
OPT = OPT =
DEBUG_FLAGS= /Ti /D__WXDEBUG__ #/Fb DEBUG_FLAGS= /Ti /D__WXDEBUG__ #/Fb
LINK_DEBUG_FLAGS=/DEBUG LINK_DEBUG_FLAGS=/DEBUG
@@ -50,7 +50,7 @@ CRTFLAG=/Gm /Gd
!else !else
# /O1 - smallest code # /O1 - smallest code
# /O2 - fastest code # /O2 - fastest code
D=Release D=RelseOS2
OPT = /O+ /Oc /G5 OPT = /O+ /Oc /G5
DEBUG_FLAGS= DEBUG_FLAGS=
LINK_DEBUG_FLAGS=/RELEASE LINK_DEBUG_FLAGS=/RELEASE

8
src/xpm/MAKEFILE.VA
View File

@@ -13,13 +13,13 @@
OBJSUFF=obj OBJSUFF=obj
SRCSUFF=cpp SRCSUFF=cpp
OS2FLAGS=/c /W3 /DOS232 /D__VISAGECPP__ /Dwx_msw /Ss /Q /N100 OS2FLAGS=/c /W2 /DOS232 /D__VISAGECPP__ /Dwx_msw /Ss /Q /N100
OS2LINKFLAGS=/BASE:0x00010000 /PMTYPE:PM /NOE /NOD /ALIGN:16 OS2LINKFLAGS=/BASE:0x00010000 /PMTYPE:PM /NOE /NOD /ALIGN:16
OS2LIBFLAGS=/NOL /NOE OS2LIBFLAGS=/NOL /NOE
OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB
# Change WXDIR or WXWIN to wherever wxWindows is found # Change WXDIR or WXWIN to wherever wxWindows is found
WXDIR = j:\dev\wx2\wxWindows WXDIR = $(WXWIN)
OS2XPMDIR=$(WXDIR)\src\xpm OS2XPMDIR=$(WXDIR)\src\xpm
OS2XPMINC=$(WINXPMDIR) OS2XPMINC=$(WINXPMDIR)
@@ -42,7 +42,7 @@ MAKEPRECOMP=/Fi$(PCH)
!endif !endif
!if "$(FINAL)" == "0" !if "$(FINAL)" == "0"
D=Debug D=DebugOS2
OPT = OPT =
DEBUG_FLAGS= /Ti /D__WXDEBUG__ #/Fb DEBUG_FLAGS= /Ti /D__WXDEBUG__ #/Fb
LINK_DEBUG_FLAGS=/DEBUG LINK_DEBUG_FLAGS=/DEBUG
@@ -50,7 +50,7 @@ CRTFLAG=/Gm /Gd
!else !else
# /O1 - smallest code # /O1 - smallest code
# /O2 - fastest code # /O2 - fastest code
D=Release D=RelseOS2
OPT = /O+ /Oc /G5 OPT = /O+ /Oc /G5
DEBUG_FLAGS= DEBUG_FLAGS=
LINK_DEBUG_FLAGS=/RELEASE LINK_DEBUG_FLAGS=/RELEASE

8
src/zlib/MAKEFILE.VA
View File

@@ -13,13 +13,13 @@
OBJSUFF=obj OBJSUFF=obj
SRCSUFF=c SRCSUFF=c
OS2FLAGS=/c /W3 /DOS232 /D__VISAGECPP__ /Ss /Q /N100 OS2FLAGS=/c /W2 /DOS232 /D__VISAGECPP__ /Ss /Q /N100
OS2LINKFLAGS=/BASE:0x00010000 /PMTYPE:PM /NOE /NOD /ALIGN:16 OS2LINKFLAGS=/BASE:0x00010000 /PMTYPE:PM /NOE /NOD /ALIGN:16
OS2LIBFLAGS=/NOL /NOE OS2LIBFLAGS=/NOL /NOE
OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB
# Change WXDIR or WXWIN to wherever wxWindows is found # Change WXDIR or WXWIN to wherever wxWindows is found
WXDIR = j:\dev\wx2\wxWindows WXDIR = $(WXWIN)
OS2ZLIBDIR=$(WXDIR)\src\zlib OS2ZLIBDIR=$(WXDIR)\src\zlib
OS2ZLIBINC=$(WINPNGDIR) OS2ZLIBINC=$(WINPNGDIR)
@@ -42,7 +42,7 @@ MAKEPRECOMP=/Fi$(PCH)
!endif !endif
!if "$(FINAL)" == "0" !if "$(FINAL)" == "0"
D=Debug D=DebugOS2
OPT = OPT =
DEBUG_FLAGS= /Ti /D__WXDEBUG__ #/Fb DEBUG_FLAGS= /Ti /D__WXDEBUG__ #/Fb
LINK_DEBUG_FLAGS=/DEBUG LINK_DEBUG_FLAGS=/DEBUG
@@ -50,7 +50,7 @@ CRTFLAG=/Gm /Gd
!else !else
# /O1 - smallest code # /O1 - smallest code
# /O2 - fastest code # /O2 - fastest code
D=Release D=RelseOS2
OPT = /O+ /Oc /G5 OPT = /O+ /Oc /G5
DEBUG_FLAGS= DEBUG_FLAGS=
LINK_DEBUG_FLAGS=/RELEASE LINK_DEBUG_FLAGS=/RELEASE