From e44e028c101c1f7ede1a6ba9d3ab25c64e5d8392 Mon Sep 17 00:00:00 2001
From: scuri <scuri>
Date: Tue, 23 Jun 2009 22:12:39 +0000
Subject: *** empty log message ***

---
 test/cdtest/cdtest.dsp | 107 -------------------------------------------------
 test/cdtest/config.mak |   8 ++--
 2 files changed, 4 insertions(+), 111 deletions(-)
 delete mode 100644 test/cdtest/cdtest.dsp

(limited to 'test/cdtest')

diff --git a/test/cdtest/cdtest.dsp b/test/cdtest/cdtest.dsp
deleted file mode 100644
index 80c1421..0000000
--- a/test/cdtest/cdtest.dsp
+++ /dev/null
@@ -1,107 +0,0 @@
-# Microsoft Developer Studio Project File - Name="cdtest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=cdtest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "cdtest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "cdtest.mak" CFG="cdtest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "cdtest - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "cdtest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\bin"
-# PROP BASE Intermediate_Dir "..\obj\cdtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\bin"
-# PROP Intermediate_Dir "..\obj\cdtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /I "..\..\include" /I "..\..\..\iup\include" /Z7 /W3 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "CDTEST_WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_MBCS" /Fp"..\obj/cdtest.pch" /Fo"$(IntDir)/" /Fd"..\obj/cdtest" /GZ /c /GX 
-# ADD CPP /nologo /MTd /I "..\..\include" /I "..\..\..\iup\include" /Z7 /W3 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "CDTEST_WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_MBCS" /Fp"..\obj/cdtest.pch" /Fo"$(IntDir)/" /Fd"..\obj/cdtest" /GZ /c /GX 
-# ADD BASE MTL /nologo /D"_DEBUG" /mktyplib203 /tlb"..\bin\cdtest.tlb" /win32 
-# ADD MTL /nologo /D"_DEBUG" /mktyplib203 /tlb"..\bin\cdtest.tlb" /win32 
-# ADD BASE RSC /l 1046 /d "_DEBUG" 
-# ADD RSC /l 1046 /d "_DEBUG" 
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo 
-# ADD BSC32 /nologo 
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib cd.lib cdiup.lib cdgdiplus.lib iup.lib gdiplus.lib cdpdflib.lib /nologo /out:"..\bin\cdtest.exe" /incremental:yes /libpath:"..\..\lib" /libpath:"..\..\..\iup\lib" /debug /pdb:"..\bin\cdtest.pdb" /pdbtype:sept /subsystem:windows /MACHINE:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib cd.lib cdiup.lib cdgdiplus.lib iup.lib gdiplus.lib cdpdflib.lib /nologo /out:"..\bin\cdtest.exe" /incremental:yes /libpath:"..\..\lib" /libpath:"..\..\..\iup\lib" /debug /pdb:"..\bin\cdtest.pdb" /pdbtype:sept /subsystem:windows /MACHINE:I386
-
-!ENDIF
-
-# Begin Target
-
-# Name "cdtest - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=Cdtest.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cdtest.led
-# End Source File
-# Begin Source File
-
-SOURCE=cdtest.rc
-# End Source File
-# Begin Source File
-
-SOURCE=cdtest_led.c
-# End Source File
-# Begin Source File
-
-SOURCE=Colorbar.c
-# End Source File
-# Begin Source File
-
-SOURCE=Drivers.c
-# End Source File
-# Begin Source File
-
-SOURCE=List.c
-# End Source File
-# Begin Source File
-
-SOURCE=Rubber.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=Cdtest.h
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/test/cdtest/config.mak b/test/cdtest/config.mak
index 9453944..e04e7d1 100644
--- a/test/cdtest/config.mak
+++ b/test/cdtest/config.mak
@@ -7,7 +7,7 @@ ifeq "$(TEC_SYSNAME)" "Win32"
 endif
 
 USE_CD=Yes
-USE_IUP=Yes
+USE_IUP3=Yes
 
 cdtest_led.c: cdtest.led
 	ledc -f cdtest_loadled -o cdtest_led.c cdtest.led
@@ -15,10 +15,10 @@ cdtest_led.c: cdtest.led
 USE_STATIC = Yes
 
 #IUP = ../../../iup
-CD = ../..
+#CD = ../..
 
 ifneq ($(findstring Win, $(TEC_SYSNAME)), )
-  LIBS = cdpdflib
+  LIBS = cdpdflib pdflib
 else
-  SLIB = $(CD)/lib/$(TEC_UNAME)/libcdpdflib.a
+  SLIB = $(CD)/lib/$(TEC_UNAME)/libcdpdf.a $(CD)/lib/$(TEC_UNAME)/libpdflib.a
 endif
-- 
cgit v1.2.3