summaryrefslogtreecommitdiff
path: root/win/LeoCAD.dsp
diff options
context:
space:
mode:
authorleo2000-08-24 21:24:42 +0000
committerleo2000-08-24 21:24:42 +0000
commit31a1d493ed4ca5d263244a8a3231111a58bdc5c4 (patch)
tree9963c933eb4fe42f257db26c7938009c4a88b0f4 /win/LeoCAD.dsp
parente54d0ecfb00132cb4eeafb7d909f89c93a7b3ca6 (diff)
Updated the Windows version with the new Minifig Wizard.
Fixed some OpenGL problems on the Windows version. git-svn-id: http://svn.leocad.org/trunk@106 c7d43263-9d01-0410-8a33-9dba5d9f93d6
Diffstat (limited to 'win/LeoCAD.dsp')
-rw-r--r--win/LeoCAD.dsp110
1 files changed, 69 insertions, 41 deletions
diff --git a/win/LeoCAD.dsp b/win/LeoCAD.dsp
index 5cb4d8d..b4ab015 100644
--- a/win/LeoCAD.dsp
+++ b/win/LeoCAD.dsp
@@ -52,7 +52,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
-# ADD LINK32 vfw32.lib glu32.lib opengl32.lib jpeglib.lib 3dsftk.lib libpng.lib zlib.lib /nologo /subsystem:windows /map /machine:I386 /libpath:"./jpeglib/release" /libpath:"./3dsftk/release" /libpath:"./libpng/release" /libpath:"./zlib/release"
+# ADD LINK32 vfw32.lib jpeglib.lib 3dsftk.lib libpng.lib zlib.lib /nologo /subsystem:windows /map /machine:I386 /libpath:"./jpeglib/release" /libpath:"./3dsftk/release" /libpath:"./libpng/release" /libpath:"./zlib/release"
!ELSEIF "$(CFG)" == "LeoCAD - Win32 Debug"
@@ -78,7 +78,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 vfw32.lib glu32.lib opengl32.lib jpeglib.lib 3dsftk.lib libpng.lib zlib.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:"./jpeglib/debug" /libpath:"./3dsftk/debug" /libpath:"./libpng/debug" /libpath:"./zlib/debug"
+# ADD LINK32 vfw32.lib jpeglib.lib 3dsftk.lib libpng.lib zlib.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:"./jpeglib/debug" /libpath:"./3dsftk/debug" /libpath:"./libpng/debug" /libpath:"./zlib/debug"
# SUBTRACT LINK32 /profile
!ENDIF
@@ -174,42 +174,20 @@ SOURCE=.\Leocad.cpp
SOURCE=.\hlp\LeoCAD.hpj
USERDEP__LEOCA="$(ProjDir)\hlp\AfxCore.rtf" "$(ProjDir)\hlp\AfxPrint.rtf"
+# End Source File
+# Begin Source File
-!IF "$(CFG)" == "LeoCAD - Win32 Release"
-
-# Begin Custom Build - Making help file...
-OutDir=.\Release
-ProjDir=.
-TargetName=LeoCAD
-InputPath=.\hlp\LeoCAD.hpj
-
-"$(OutDir)\$(TargetName).hlp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- call "$(ProjDir)\makehelp.bat"
+SOURCE=.\Leocad.rc
-# End Custom Build
+!IF "$(CFG)" == "LeoCAD - Win32 Release"
!ELSEIF "$(CFG)" == "LeoCAD - Win32 Debug"
-# Begin Custom Build - Making help file...
-OutDir=.\Debug
-ProjDir=.
-TargetName=LeoCAD
-InputPath=.\hlp\LeoCAD.hpj
-
-"$(OutDir)\$(TargetName).hlp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- call "$(ProjDir)\makehelp.bat"
-
-# End Custom Build
-
!ENDIF
# End Source File
# Begin Source File
-SOURCE=.\Leocad.rc
-# End Source File
-# Begin Source File
-
SOURCE=.\Libdlg.cpp
# End Source File
# Begin Source File
@@ -337,6 +315,10 @@ SOURCE=.\Transbar.cpp
SOURCE=.\Wheelwnd.cpp
# End Source File
+# Begin Source File
+
+SOURCE=.\win_gl.cpp
+# End Source File
# End Group
# Begin Group "Header Files"
@@ -527,10 +509,6 @@ SOURCE=.\StepPop.h
# End Source File
# Begin Source File
-SOURCE=.\system.h
-# End Source File
-# Begin Source File
-
SOURCE=.\TerOpDlg.h
# End Source File
# Begin Source File
@@ -561,6 +539,10 @@ SOURCE=.\Transbar.h
SOURCE=.\WheelWnd.h
# End Source File
+# Begin Source File
+
+SOURCE=.\win_gl.h
+# End Source File
# End Group
# Begin Group "Resource Files"
@@ -947,15 +929,6 @@ SOURCE=.\hlp\Scmin.bmp
# PROP Default_Filter ""
# Begin Source File
-SOURCE=..\Common\boundbox.cpp
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\boundbox.h
-# End Source File
-# Begin Source File
-
SOURCE=..\Common\camera.cpp
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
@@ -1044,6 +1017,57 @@ SOURCE=..\Common\matrix.h
# End Source File
# Begin Source File
+SOURCE=..\common\minifig.cpp
+
+!IF "$(CFG)" == "LeoCAD - Win32 Release"
+
+!ELSEIF "$(CFG)" == "LeoCAD - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\common\minifig.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\common\object.cpp
+
+!IF "$(CFG)" == "LeoCAD - Win32 Release"
+
+!ELSEIF "$(CFG)" == "LeoCAD - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\common\object.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\common\opengl.cpp
+
+!IF "$(CFG)" == "LeoCAD - Win32 Release"
+
+!ELSEIF "$(CFG)" == "LeoCAD - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\common\opengl.h
+# End Source File
+# Begin Source File
+
SOURCE=..\Common\piece.cpp
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
@@ -1080,6 +1104,10 @@ SOURCE=..\Common\quant.h
# End Source File
# Begin Source File
+SOURCE=..\common\system.h
+# End Source File
+# Begin Source File
+
SOURCE=..\Common\terrain.cpp
# SUBTRACT CPP /YX /Yc /Yu
# End Source File