removed src/gtk/eggtrayicon.h

[wxWidgets.git] / src / makemsc.env

diff --git a/src/makemsc.env b/src/makemsc.env
index f21ae55fec849199a4f7b16e9ec345aee8a14c07..b896b1852f38c79c8493960312eee50152dd2f35 100644 (file)
--- a/src/makemsc.env
+++ b/src/makemsc.env
@@ -3,7 +3,7 @@
 # Author:      Julian Smart
 # Created:     1993
 # Updated:     
 # Author:      Julian Smart
 # Created:     1993
 # Updated:     

-# Copyright:   (c) 1993, AIAI, University of Edinburgh
+# Copyright:   

 #
 # "%W% %G%"
 #
 #
 # "%W% %G%"
 #


@@ -20,13 +20,14 @@
 WXDIR = $(WXWIN)
 WXINC = $(WXDIR)\include
 
 WXDIR = $(WXWIN)
 WXINC = $(WXDIR)\include
 

-WXLIB=$(WXDIR)\lib\wx1.lib $(WXDIR)\lib\wx2.lib $(WXDIR)\lib\wx3.lib
+WXLIB=$(WXDIR)\lib\wx1.lib $(WXDIR)\lib\wx2.lib $(WXDIR)\lib\wx3.lib $(WXDIR)\lib\wx4.lib $(WXDIR)\lib\wx5.lib

 
 # Suffixes
 OBJSUFF=obj
 SRCSUFF=cpp
 
 
 # Suffixes
 OBJSUFF=obj
 SRCSUFF=cpp
 

-INC=/I$(WXDIR)\include
+#INC=/I$(WXDIR)\include
+INC=-I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg $(EXTRAINC)

 
 # Set this to nothing if using MS C++ 7
 ZOPTION=/Z7
 
 # Set this to nothing if using MS C++ 7
 ZOPTION=/Z7


@@ -51,7 +52,7 @@ DEBUG_FLAGS=
 LINK_DEBUG_FLAGS=
 !endif
 
 LINK_DEBUG_FLAGS=
 !endif
 

-LIBS=$(WXLIB) $(EXTRALIBS) oldnames libw llibcew commdlg ddeml shell mmsystem ole2 $(WXDIR)\src\msw\ctl3d\msvc\ctl3dv2.lib
+LIBS=$(WXLIB) $(EXTRALIBS) oldnames libw llibcew commdlg ddeml shell mmsystem ole2 $(WXDIR)\lib\msvc15\ctl3dv2.lib

 
 !if "$(DLL)" == "0"
 PCH=WX.PCH
 
 !if "$(DLL)" == "0"
 PCH=WX.PCH