Some makefile corrections

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -10,7 +10,7 @@
WXDIR = $(WXWIN)
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\
mainfrm.obj project.obj dialogs.obj csprint.obj

View File

@@ -13,7 +13,7 @@
WXDIR = $(WXWIN)
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\
mainfrm.obj project.obj dialogs.obj csprint.obj

View File

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

View File

@@ -8,7 +8,7 @@
WXDIR = $(%WXWIN)
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 &
mainfrm.obj project.obj dialogs.obj csprint.obj