Unicode-enabled the STC sample

[wxWidgets.git] / src / makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index 1a9851fdaf0260c6d19c89796a84f2347cc11611..eb146ba325a68ea06466a1de5eb8a2a2de8ebf33 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -30,6 +30,15 @@
 #
 MINGW32=1
 
+# set MIN_SUFFIX to nothing if you use only MinGW compiler, set it to
+# something MinGW-specific if you want to build wxWindows with more than one
+# compiler
+ifeq ($(MINGW32),1)
+  MIN_SUFFIX=_min
+else
+  MIN_SUFFIX=_cyg
+endif
+
 # Set to your gcc version. Generally 'gcc --version' tells you
 # which version you have. But it cannot distinguish between
 # 2.95.2-1 and earlier suffix versions of 2.95 . In that case,
@@ -69,7 +78,7 @@ OSTYPE=msys
 endif
 
 # If building DLL, the version
-include version.mak
+include $(WXDIR)/src/version.mak
 WXVERSION=$(wxMAJOR_VERSION)$(wxMINOR_VERSION)$(wxRELEASE_NUMBER_IFUNSTABLE)
 
 ifndef UNICODE
@@ -320,7 +329,7 @@ ifdef WXUSINGDLL
   # png, jpeg, etc are exported from wx dll, so skip and save on link time.
   LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(COMPLIBS)
 else
-  LIBS = $(EXTRALIBS) $(WXLIB) -lregex -lpng -ljpeg -lzlib -ltiff $(WINLIBS) $(COMPLIBS)
+  LIBS = $(EXTRALIBS) $(WXLIB) -lregex$(MIN_SUFFIX) -lpng$(MIN_SUFFIX) -ljpeg$(MIN_SUFFIX) -lzlib$(MIN_SUFFIX) -ltiff$(MIN_SUFFIX) $(WINLIBS) $(COMPLIBS)
 endif
 
 WINFLAGS = $(OBSOLETE_DEFINES) $(WINVERSION)
@@ -356,12 +365,12 @@ WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx$(TOOLKIT)$(UNIEXT)$(DEBEXT).$(LIBSUFF)
 
 ifdef WXMAKINGDLL
   EXTRADLLFLAGS = -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1
-  WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT).$(LIBSUFF)
+  WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT)$(MIN_SUFFIX).$(LIBSUFF)
 endif
 
 ifdef WXUSINGDLL
   EXTRADLLFLAGS = -DWXUSINGDLL=1
-  WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT).$(LIBSUFF)
+  WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT)$(MIN_SUFFIX).$(LIBSUFF)
 endif