fixed dll import specification of wxGetHInstance()

[wxWidgets.git] / src / msw / makebase.vc

diff --git a/src/msw/makebase.vc b/src/msw/makebase.vc
index 670c54fcf356c03c93a099cdf5ff7c3e8764eeb5..30d299e364379796497c0781e0e143dea992a08a 100644 (file)
--- a/src/msw/makebase.vc
+++ b/src/msw/makebase.vc
@@ -59,7 +59,6 @@ $(CPPFLAGS2) /Fo$@ /c /Tc $<
 <<
 
 COMMONOBJS = \
-    ..\common\$D\y_tab.obj \
     ..\common\$D\appcmn.obj \
                ..\common\$D\clntdata.obj \
                ..\common\$D\cmdline.obj \
@@ -143,17 +142,13 @@ MSWOBJS = ..\msw\$D\dde.obj \
 
 OBJECTS = $(COMMONOBJS) $(MSWOBJS) 
 
-ARCHINCDIR=$(WXDIR)\lib\$(_WXINC_BUILD)$(_WXINC_DLLSUFFIX)$(_WXINC_SUFFIX)$(LIBEXT)
+ARCHINCDIR=$(WXDIR)\lib\base$(INCEXT)
 SETUP_H=$(ARCHINCDIR)\wx\setup.h
 
 # Normal, static library
 #all:    dirs $(SETUP_H) $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET)
 all:    dirs $(SETUP_H) $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) zlib $(LIBTARGET)
 
-$(ARCHINCDIR)\wx:
-    mkdir $(ARCHINCDIR)
-    mkdir $(ARCHINCDIR)\wx
-
 $(WXDIR)\include\wx\msw\setup.h:
     cd $(WXDIR)\include\wx\msw
     if not exist setup.h copy setup0.h setup.h
@@ -162,7 +157,7 @@ $(WXDIR)\include\wx\msw\setup.h:
 $(SETUP_H): $(WXDIR)\include\wx\msw\setup.h
     copy $(WXDIR)\include\wx\msw\setup.h $@
 
-dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(ARCHINCDIR)\wx $(WXDIR)\$D
+dirs: $(MSWDIR)\$D $(COMMDIR)\$D 
 
 $D:
     mkdir $D
@@ -173,9 +168,6 @@ $(COMMDIR)\$D:
 $(MSWDIR)\$D:
     mkdir $(MSWDIR)\$D
 
-$(WXDIR)\$D:
-    mkdir $(WXDIR)\$D
-
 ### Static library
 
 $(WXDIR)\lib\$(WXLIBNAME).lib:      $(DUMMYOBJ) $(OBJECTS) 
@@ -190,18 +182,7 @@ $(DUMMYOBJ): $(DUMMY).$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(SETUP_H)
         cl $(CPPFLAGS) $(MAKEPRECOMP) /Fo$(DUMMYOBJ) /c /Tp $(DUMMY).cpp
 ########################################################
 
-..\common\$D\y_tab.obj:     ..\common\y_tab.c ..\common\lex_yy.c
-        cl @<<
-$(CPPFLAGS2) /c ..\common\y_tab.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
-<<
-
-..\common\y_tab.c:     ..\common\dosyacc.c
-        copy "..\common"\dosyacc.c "..\common"\y_tab.c
-
-..\common\lex_yy.c:    ..\common\doslex.c
-    copy "..\common"\doslex.c "..\common"\lex_yy.c
-
-$(OBJECTS): $(SETUP_H)
+$(OBJECTS): $(WXDIR)/include/wx/setup.h
 
 ..\common\$D\unzip.obj:     ..\common\unzip.c
         cl @<<
@@ -272,8 +253,6 @@ clean: $(PERIPH_CLEAN_TARGET)
         -erase $(COMMDIR)\$D\*.sbr
         -erase $(COMMDIR)\$D\*.idb
         -erase $(COMMDIR)\$D\*.pch
-        -erase $(COMMDIR)\y_tab.c
-        -erase $(COMMDIR)\lex_yy.c
         -erase $(MSWDIR)\$D\*.idb
         -erase $(MSWDIR)\$D\*.pdb
         -erase $(MSWDIR)\$D\*.pch