(should) fix unix compilation...

[wxWidgets.git] / samples / regtest / Makefile.in

diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in
index 6bc9e1e1786baed69f3354fe836f6b3dcd6a077a..dcc342c8520eb018760fc570f7e5024a8b04dcae 100644 (file)
--- a/samples/regtest/Makefile.in
+++ b/samples/regtest/Makefile.in
@@ -34,11 +34,13 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
 
 ### Variables: ###
 

+DESTDIR = 

 LIBDIRNAME = $(top_builddir)lib
 LIBDIRNAME = $(top_builddir)lib

-REGTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+REGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \

        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \

-       -I$(srcdir)/../../samples $(CXXFLAGS)
+       -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)

 REGTEST_OBJECTS =  \
 REGTEST_OBJECTS =  \

+       $(__regtest_os2_lib_res) \

        regtest_regtest.o \
        $(__regtest___win32rc)
 WX_VERSION = 2.5.1
        regtest_regtest.o \
        $(__regtest___win32rc)
 WX_VERSION = 2.5.1


@@ -98,6 +100,8 @@ COND_PLATFORM_OS2_1___regtest___os2_emxbindcmd = $(NM) regtest$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__regtest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___regtest___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__regtest___win32rc = regtest_regtest_rc.o
 @COND_PLATFORM_MACOSX_1@__regtest_bundle___depname = regtest_bundle
 @COND_PLATFORM_OS2_1@__regtest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___regtest___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__regtest___win32rc = regtest_regtest_rc.o
 @COND_PLATFORM_MACOSX_1@__regtest_bundle___depname = regtest_bundle

+@COND_PLATFORM_OS2_1@__regtest_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res

 
 ### Targets: ###
 
 
 ### Targets: ###
 


@@ -141,8 +145,8 @@ regtest.app/Contents/PkgInfo: regtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        ln -f regtest$(EXEEXT) regtest.app/Contents/MacOS/regtest
        
        
        ln -f regtest$(EXEEXT) regtest.app/Contents/MacOS/regtest
        
        

-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc regtest.app/Contents/Resources/regtest.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns regtest.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc regtest.app/Contents/Resources/regtest.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns regtest.app/Contents/Resources/wxmac.icns

 
 @COND_PLATFORM_MACOSX_1@regtest_bundle: regtest.app/Contents/PkgInfo
 
 
 @COND_PLATFORM_MACOSX_1@regtest_bundle: regtest.app/Contents/PkgInfo