X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=OPJViewer%2FOPJViewer.dsp;h=d9521f4ce8594e4999cbd04c0a6a3d957f2d4e99;hb=95d760a1735517347355ff875549d85ebbc72eb7;hp=c882690d83c5c37843aec9d72a19096bc51174e5;hpb=adc1aacb600419d6ce8427d652da4f53efc5e408;p=openjpeg.git

diff --git a/OPJViewer/OPJViewer.dsp b/OPJViewer/OPJViewer.dsp
index c882690d..d9521f4c 100644
--- a/OPJViewer/OPJViewer.dsp
+++ b/OPJViewer/OPJViewer.dsp
@@ -42,16 +42,21 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /MD /W3 /GX /O2 /I "c:\programmi\wxWidgets-2.8.0\lib\vc_lib\msw" /I "c:\programmi\wxWidgets-2.8.0\include" /I ".." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /D "wxUSE_LIBOPENJPEG" /D "OPJ_STATIC" /D "USE_JPWL" /D "OPJ_HTMLABOUT" /D "OPJ_MANYFORMATS" /FR /FD /c
+# ADD CPP /nologo /G6 /MD /W3 /GX /O2 /I "d:\programmi\wxWidgets-2.8.0\lib\vc_lib\msw" /I "d:\programmi\wxWidgets-2.8.0\include" /I ".." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /D "wxUSE_LIBOPENJPEG" /D "OPJ_STATIC" /D "USE_JPWL" /D "USE_JPSEC" /D "OPJ_HTMLABOUT" /D "OPJ_MANYFORMATS" /D "OPJ_INICONFIG" /FR /FD /c
 # ADD BASE RSC /l 0x410 /d "NDEBUG"
-# ADD RSC /l 0x409 /i "c:\programmi\wxWidgets-2.8.0\include" /d "NDEBUG"
+# ADD RSC /l 0x409 /i "d:\programmi\wxWidgets-2.8.0\include" /d "NDEBUG"
 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 /nologo /subsystem:console /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 rpcrt4.lib wsock32.lib wxzlib.lib wxregex.lib wxpng.lib wxjpeg.lib wxbase28.lib wxmsw28_core.lib wxmsw28_html.lib wxmsw28_adv.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib LibOpenJPEG_JPWL.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcmt.lib" /libpath:"c:\programmi\wxWidgets-2.8.0\lib\vc_lib" /libpath:"..\jpwl\Release" /IGNORE:4089
+# 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 rpcrt4.lib wsock32.lib wxzlib.lib wxregex.lib wxpng.lib wxjpeg.lib wxbase28.lib wxmsw28_core.lib wxmsw28_html.lib wxmsw28_adv.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib LibOpenJPEG_JPWL.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcmt.lib" /libpath:"d:\programmi\wxWidgets-2.8.0\lib\vc_lib" /libpath:"..\jpwl\Release" /IGNORE:4089
 # SUBTRACT LINK32 /pdb:none
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Desc=Update build number
+PostBuild_Cmds=buildupdate.bat
+# End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "OPJViewer - Win32 Debug"
 
@@ -67,7 +72,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "d:\Programmi\wxWidgets-2.8.0\INCLUDE" /I "d:\programmi\wxWidgets-2.8.0\lib\vc_lib\msw" /I "d:\programmi\wxWidgets-2.8.0\include" /I ".." /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=1 /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /D "wxUSE_LIBOPENJPEG" /D "OPJ_STATIC" /D "USE_JPWL" /D "OPJ_HTMLABOUT" /FR /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "d:\Programmi\wxWidgets-2.8.0\INCLUDE" /I "d:\programmi\wxWidgets-2.8.0\lib\vc_lib\msw" /I "c:\programmi\wxWidgets-2.8.0\include" /I ".." /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=1 /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /D "wxUSE_LIBOPENJPEG" /D "OPJ_STATIC" /D "USE_JPWL" /D "OPJ_HTMLABOUT" /FR /FD /GZ /c
 # ADD BASE RSC /l 0x410 /d "_DEBUG"
 # ADD RSC /l 0x410 /i "d:\programmi\wxWidgets-2.8.0\include" /d "_DEBUG"
 BSC32=bscmake.exe
@@ -106,6 +111,10 @@ SOURCE=.\source\imagmj2.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\source\OPJDialogs.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\source\OPJViewer.cpp
 # End Source File
 # Begin Source File
@@ -126,6 +135,19 @@ SOURCE=.\source\about_htm.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\source\build.h
+
+!IF  "$(CFG)" == "OPJViewer - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "OPJViewer - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\source\imagj2k.h
 # End Source File
 # Begin Source File
@@ -146,6 +168,50 @@ SOURCE=.\source\OPJViewer.h
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 # Begin Source File
 
+SOURCE=.\source\wx\msw\blank.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\wx\msw\bullseye.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\wx\msw\cdrom.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\wx\msw\computer.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\wx\msw\cross.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\wx\msw\drive.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\wx\msw\file1.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\wx\msw\floppy.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\wx\msw\folder1.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\wx\msw\folder2.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\wx\msw\hand.cur
+# End Source File
+# Begin Source File
+
 SOURCE=.\source\icon1.xpm
 # End Source File
 # Begin Source File
@@ -166,6 +232,10 @@ SOURCE=.\source\icon5.xpm
 # End Source File
 # Begin Source File
 
+SOURCE=.\source\wx\msw\magnif1.cur
+# End Source File
+# Begin Source File
+
 SOURCE=.\source\opj_logo.xpm
 # End Source File
 # Begin Source File
@@ -188,6 +258,38 @@ SOURCE=.\source\OPJViewer.rc
 
 SOURCE=.\source\OPJViewer16.xpm
 # End Source File
+# Begin Source File
+
+SOURCE=.\source\wx\msw\pbrush.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\wx\msw\pencil.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\wx\msw\pntleft.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\wx\msw\pntright.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\wx\msw\removble.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\wx\msw\rightarr.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\wx\msw\roller.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\wx\msw\std.ico
+# End Source File
 # End Group
 # End Target
 # End Project