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

Some makefile corrections

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2001-05-07 14:37:53 +00:00
parent e96360efd9
commit 779cedff87
18 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/samples/ogl/ogledit/makefile.b32
View File

@@ -10,8 +10,7 @@
WXDIR = $(WXWIN) WXDIR = $(WXWIN)
TARGET=ogledit TARGET=ogledit
EXTRALIBS=$(WXDIR)\contrib\lib\ogl.lib EXTRALIBS=$(WXDIR)\lib\ogl.lib
# EXTRACPPFLAGS=-I$(WXDIR)\utils\ogl\src
OBJECTS = $(TARGET).obj doc.obj view.obj palette.obj OBJECTS = $(TARGET).obj doc.obj view.obj palette.obj
!include $(WXDIR)\src\makeprog.b32 !include $(WXDIR)\src\makeprog.b32

3
contrib/samples/ogl/ogledit/makefile.bcc
View File

@@ -13,8 +13,7 @@
WXDIR = $(WXWIN) WXDIR = $(WXWIN)
TARGET=ogledit TARGET=ogledit
EXTRALIBS=$(WXDIR)\contrib\lib\ogl.lib EXTRALIBS=$(WXDIR)\lib\ogl.lib
# EXTRACPPFLAGS=-I$(WXDIR)\utils\ogl\src
OBJECTS = $(TARGET).obj doc.obj view.obj palette.obj OBJECTS = $(TARGET).obj doc.obj view.obj palette.obj
!include $(WXDIR)\src\makeprog.b32 !include $(WXDIR)\src\makeprog.b32

4
contrib/samples/ogl/ogledit/makefile.dos
View File

@@ -16,8 +16,8 @@ WXDIR = $(WXWIN)
!include $(WXDIR)\src\makemsc.env !include $(WXDIR)\src\makemsc.env
THISDIR = $(WXDIR)\contrib\samples\ogl\ogledit THISDIR = $(WXDIR)\contrib\samples\ogl\ogledit
WXLIB = $(WXDIR)\contrib\lib\wx.lib WXLIB = $(WXDIR)\lib\wx.lib
OGLLIB = $(WXDIR)\contrib\lib\ogl.lib OGLLIB = $(WXDIR)\lib\ogl.lib
LIBS=$(WXLIB) $(OGLLIB) oldnames libw llibcew commdlg shell ddeml LIBS=$(WXLIB) $(OGLLIB) oldnames libw llibcew commdlg shell ddeml

4
contrib/samples/ogl/ogledit/makefile.vc
View File

@@ -18,9 +18,9 @@ PROGRAM=ogledit
FINAL=0 FINAL=0
!if "$(FINAL)" == "0" !if "$(FINAL)" == "0"
EXTRALIBS=$(WXDIR)\contrib\lib\ogld.lib EXTRALIBS=$(WXDIR)\lib\ogld.lib
!else !else
EXTRALIBS=$(WXDIR)\contrib\lib\ogl.lib EXTRALIBS=$(WXDIR)\lib\ogl.lib
!endif !endif
OBJECTS = $(PROGRAM).obj doc.obj view.obj palette.obj OBJECTS = $(PROGRAM).obj doc.obj view.obj palette.obj

2
contrib/samples/ogl/ogledit/makefile.wat
View File

@@ -8,7 +8,7 @@
WXDIR = $(%WXWIN) WXDIR = $(%WXWIN)
PROGRAM = ogledit PROGRAM = ogledit
EXTRALIBS = $(WXDIR)\contrib\lib\ogl.lib EXTRALIBS = $(WXDIR)\lib\ogl.lib
OBJECTS = $(PROGRAM).obj doc.obj view.obj palette.obj OBJECTS = $(PROGRAM).obj doc.obj view.obj palette.obj
!include $(WXDIR)\src\makeprog.wat !include $(WXDIR)\src\makeprog.wat

2
contrib/samples/ogl/studio/makefile.b32
View File

@@ -10,7 +10,7 @@
WXDIR = $(WXWIN) WXDIR = $(WXWIN)
TARGET=studio TARGET=studio
EXTRALIBS=$(WXDIR)\contrib\lib\ogl.lib EXTRALIBS=$(WXDIR)\lib\ogl.lib
OBJECTS = $(TARGET).obj doc.obj shapes.obj symbols.obj view.obj cspalette.obj\ OBJECTS = $(TARGET).obj doc.obj shapes.obj symbols.obj view.obj cspalette.obj\
mainfrm.obj project.obj dialogs.obj csprint.obj mainfrm.obj project.obj dialogs.obj csprint.obj

2
contrib/samples/ogl/studio/makefile.bcc
View File

@@ -13,7 +13,7 @@
WXDIR = $(WXWIN) WXDIR = $(WXWIN)
TARGET=studio TARGET=studio
EXTRALIBS=$(WXDIR)\contrib\lib\ogl.lib EXTRALIBS=$(WXDIR)\lib\ogl.lib
OBJECTS = $(TARGET).obj doc.obj shapes.obj symbols.obj view.obj cspalette.obj\ OBJECTS = $(TARGET).obj doc.obj shapes.obj symbols.obj view.obj cspalette.obj\
mainfrm.obj project.obj dialogs.obj csprint.obj mainfrm.obj project.obj dialogs.obj csprint.obj

4
contrib/samples/ogl/studio/makefile.vc
View File

@@ -18,9 +18,9 @@ PROGRAM=studio
FINAL=0 FINAL=0
!if "$(FINAL)" == "0" !if "$(FINAL)" == "0"
EXTRALIBS=$(WXDIR)\contrib\lib\ogld.lib EXTRALIBS=$(WXDIR)\lib\ogld.lib
!else !else
EXTRALIBS=$(WXDIR)\contrib\lib\ogl.lib EXTRALIBS=$(WXDIR)\lib\ogl.lib
!endif !endif
OBJECTS = $(PROGRAM).obj doc.obj shapes.obj symbols.obj view.obj cspalette.obj\ OBJECTS = $(PROGRAM).obj doc.obj shapes.obj symbols.obj view.obj cspalette.obj\

2
contrib/samples/ogl/studio/makefile.wat
View File

@@ -8,7 +8,7 @@
WXDIR = $(%WXWIN) WXDIR = $(%WXWIN)
PROGRAM = studio PROGRAM = studio
EXTRALIBS = $(WXDIR)\contrib\lib\ogl.lib EXTRALIBS = $(WXDIR)\lib\ogl.lib
OBJECTS = $(PROGRAM).obj doc.obj shapes.obj symbols.obj view.obj cspalette.obj & OBJECTS = $(PROGRAM).obj doc.obj shapes.obj symbols.obj view.obj cspalette.obj &
mainfrm.obj project.obj dialogs.obj csprint.obj mainfrm.obj project.obj dialogs.obj csprint.obj

2
contrib/samples/xml/makefile.b32
View File

@@ -11,7 +11,7 @@ WXDIR = $(WXWIN)
TARGET=xmldemo TARGET=xmldemo
EXTRALIBS=$(WXDIR)\contrib\lib\wxxml.lib EXTRALIBS=$(WXDIR)\lib\wxxml.lib
OBJECTS = $(TARGET).obj OBJECTS = $(TARGET).obj
!include $(WXDIR)\src\makeprog.b32 !include $(WXDIR)\src\makeprog.b32

2
contrib/samples/xml/makefile.vc
View File

@@ -7,7 +7,7 @@ WXDIR = $(WXWIN)
PROGRAM = xmldemo PROGRAM = xmldemo
OBJECTS = $(PROGRAM).obj OBJECTS = $(PROGRAM).obj
EXTRALIBS = $(WXDIR)\contrib\lib\wxxml$(LIBEXT).lib EXTRALIBS = $(WXDIR)\lib\wxxml$(LIBEXT).lib
EXTRAINC = -I$(WXDIR)\contrib\include EXTRAINC = -I$(WXDIR)\contrib\include
!include $(WXDIR)\src\makeprog.vc !include $(WXDIR)\src\makeprog.vc

4
contrib/src/ogl/OglVC.dsp
View File

@@ -50,7 +50,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo # ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\..\lib\ogl.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\ogl.lib"
!ELSEIF "$(CFG)" == "OglVC - Win32 Debug" !ELSEIF "$(CFG)" == "OglVC - Win32 Debug"
@@ -74,7 +74,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo # ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\..\lib\ogld.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\ogld.lib"
!ENDIF !ENDIF

2
contrib/src/ogl/makefile.b32
View File

@@ -9,7 +9,7 @@
WXDIR = $(WXWIN) WXDIR = $(WXWIN)
LIBTARGET=$(WXDIR)\contrib\lib\ogl.lib LIBTARGET=$(WXDIR)\lib\ogl.lib
OBJECTS = basic.obj basic2.obj canvas.obj ogldiag.obj lines.obj misc.obj divided.obj constrnt.obj\ OBJECTS = basic.obj basic2.obj canvas.obj ogldiag.obj lines.obj misc.obj divided.obj constrnt.obj\
composit.obj drawn.obj bmpshape.obj mfutils.obj composit.obj drawn.obj bmpshape.obj mfutils.obj

2
contrib/src/ogl/makefile.bcc
View File

@@ -12,7 +12,7 @@
WXDIR = $(WXWIN) WXDIR = $(WXWIN)
LIBTARGET=$(WXDIR)\contrib\lib\ogl.lib LIBTARGET=$(WXDIR)\lib\ogl.lib
OBJECTS = basic.obj basic2.obj canvas.obj ogldiag.obj lines.obj misc.obj divided.obj constrnt.obj\ OBJECTS = basic.obj basic2.obj canvas.obj ogldiag.obj lines.obj misc.obj divided.obj constrnt.obj\
composit.obj drawn.obj bmpshape.obj mfutils.obj composit.obj drawn.obj bmpshape.obj mfutils.obj

2
contrib/src/ogl/makefile.dos
View File

@@ -20,7 +20,7 @@ OGLDIR = $(WXDIR)\contrib\src\ogl
THISDIR = $(OGLDIR) THISDIR = $(OGLDIR)
DOCDIR = $(WXDIR)\contrib\docs\latex\ogl DOCDIR = $(WXDIR)\contrib\docs\latex\ogl
GRAPHICSLIB = $(WXDIR)\contrib\lib\ogl.lib GRAPHICSLIB = $(WXDIR)\lib\ogl.lib
INC = /I$(WXDIR)\include /I$(WXDIR)\contrib\include INC = /I$(WXDIR)\include /I$(WXDIR)\contrib\include
# Normally set OPTIONS = # Normally set OPTIONS =

2
contrib/src/ogl/makefile.g95
View File

@@ -9,7 +9,7 @@
WXDIR = ../../.. WXDIR = ../../..
LIBTARGET=$(WXDIR)/contrib/lib/libogl.a LIBTARGET=$(WXDIR)/lib/libogl.a
OBJECTS = basic.o basic2.o canvas.o ogldiag.o lines.o misc.o divided.o constrnt.o\ OBJECTS = basic.o basic2.o canvas.o ogldiag.o lines.o misc.o divided.o constrnt.o\
composit.o drawn.o bmpshape.o mfutils.o composit.o drawn.o bmpshape.o mfutils.o

2
contrib/src/ogl/makefile.vc
View File

@@ -28,7 +28,7 @@ PROGRAM=test
OBJECTS = $(D)\basic.obj $(D)\basic2.obj $(D)\canvas.obj $(D)\ogldiag.obj $(D)\lines.obj $(D)\misc.obj $(D)\divided.obj $(D)\constrnt.obj\ OBJECTS = $(D)\basic.obj $(D)\basic2.obj $(D)\canvas.obj $(D)\ogldiag.obj $(D)\lines.obj $(D)\misc.obj $(D)\divided.obj $(D)\constrnt.obj\
$(D)\composit.obj $(D)\drawn.obj $(D)\bmpshape.obj $(D)\mfutils.obj $(D)\composit.obj $(D)\drawn.obj $(D)\bmpshape.obj $(D)\mfutils.obj
LIBTARGET=$(WXDIR)\contrib\lib\ogl$(LIBEXT).lib LIBTARGET=$(WXDIR)\lib\ogl$(LIBEXT).lib
all: $(D) $(LIBTARGET) all: $(D) $(LIBTARGET)

2
contrib/src/ogl/makefile.wat
View File

@@ -6,7 +6,7 @@ WXDIR = ..\..\..
EXTRACPPFLAGS=/DPROLOGIO EXTRACPPFLAGS=/DPROLOGIO
OGLLIB = $(WXDIR)\contrib\lib\ogl.lib OGLLIB = $(WXDIR)\lib\ogl.lib
THISDIR = $(WXDIR)\src\ogl THISDIR = $(WXDIR)\src\ogl
NAME = ogl NAME = ogl