projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix/hack 1.
[wxWidgets.git]
/
src
/
makemsc.env
diff --git
a/src/makemsc.env
b/src/makemsc.env
index e12f7b692b0b4e742d7aebd95a6484666e0dc4cf..70d41d4cf531232bac5449a3ac2e7d2967e038b3 100644
(file)
--- a/
src/makemsc.env
+++ b/
src/makemsc.env
@@
-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
$(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