zcy
/
solvespace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
solvespace/Makefile.msvc

131 lines
3.7 KiB
Makefile
Raw Normal View History

Updated the bundled LibPNG/zlib, and polished the MSVC makefile further The bundled copies of LibPNG and zlib have been updated to the versions shipped with FLTK (as these were convenient to build), and I've put in new static libraries compiled with Visual Studio 2003 .NET. These libraries link cleanly even with Visual Studio 2013 Express, so they should work for just about every version of MSVC out there that can compile SolveSpace. The MSVC makefile is also now a little nicer, and the SpaceWare Input library header #includes have been adjusted to drop the si/ prefix (for consistency with how LibPNG/zlib are handled).
2013-11-13 05:33:23 +00:00
# This is an NMAKE-compatible makefile.
Revised the MSVC Makefile and build * Generate icons.h and icons-proto.h in the source directory instead of obj/, so that pre-generated copies of these files can be distributed without being blown away by "make clean"; also updated the source files that #include these to reflect the new location * Compilation rules rewritten as batch-mode inference rules * Use Windows commands instead of Unix ones ("del" instead of "rm", "move" instead of "mv", etc.) * Sorted the object lists * Use tabs to indent rule bodies
2013-08-27 20:44:48 +00:00
# SolveSpace may be built using Microsoft Visual Studio 2003 or newer.
# (MSVC++ 6.0 is not supported.)
Updated the bundled LibPNG/zlib, and polished the MSVC makefile further The bundled copies of LibPNG and zlib have been updated to the versions shipped with FLTK (as these were convenient to build), and I've put in new static libraries compiled with Visual Studio 2003 .NET. These libraries link cleanly even with Visual Studio 2013 Express, so they should work for just about every version of MSVC out there that can compile SolveSpace. The MSVC makefile is also now a little nicer, and the SpaceWare Input library header #includes have been adjusted to drop the si/ prefix (for consistency with how LibPNG/zlib are handled).
2013-11-13 05:33:23 +00:00
# Comment out this line to compile without the SpaceWare input library.
#
Make optional the use of the SpaceNavigator libraries
2013-09-20 19:25:14 +00:00
HAVE_SPACEWARE_INPUT = 1
Updated the bundled LibPNG/zlib, and polished the MSVC makefile further The bundled copies of LibPNG and zlib have been updated to the versions shipped with FLTK (as these were convenient to build), and I've put in new static libraries compiled with Visual Studio 2003 .NET. These libraries link cleanly even with Visual Studio 2013 Express, so they should work for just about every version of MSVC out there that can compile SolveSpace. The MSVC makefile is also now a little nicer, and the SpaceWare Input library header #includes have been adjusted to drop the si/ prefix (for consistency with how LibPNG/zlib are handled).
2013-11-13 05:33:23 +00:00
DEFINES = \
/D_CRT_SECURE_NO_DEPRECATE \
/D_CRT_SECURE_NO_WARNINGS \
/D_DEBUG \
/D_WIN32_WINNT=0x500 \
/D_WIN32_IE=_WIN32_WINNT \
/DISOLATION_AWARE_ENABLED \
/DWIN32 \
/DWIN32_LEAN_AND_MEAN \
/DPACKAGE_VERSION="\"2.1\""
# We build with /MT for compatibility with the SpaceWare library, and to
# avoid a needless dependency on a C runtime DLL.
#
CXXFLAGS = /nologo /W3 /MT /I. /Iextlib\libpng /Iextlib\si /Iextlib\zlib /Zi /EHs # /O2
This is my initial checkin for solvespace, a second attempt at constraint solver drawing. I've started work on the user inteface, which will be based around two windows: one with the graphical sketch, and one command line. I've started to implement the command line, no other work. [git-p4: depot-paths = "//depot/solvespace/": change = 1652]
2008-03-25 10:02:13 +00:00
Make a copy of "freeze" library for storing stuff in registry, to make //depot/solvespace/... entirely self-contained. [git-p4: depot-paths = "//depot/solvespace/": change = 2216]
2013-08-21 05:54:54 +00:00
HEADERS = win32\freeze.h ui.h solvespace.h dsc.h sketch.h expr.h polygon.h srf\surface.h
This is my initial checkin for solvespace, a second attempt at constraint solver drawing. I've started work on the user inteface, which will be based around two windows: one with the graphical sketch, and one command line. I've started to implement the command line, no other work. [git-p4: depot-paths = "//depot/solvespace/": change = 1652]
2008-03-25 10:02:13 +00:00
OBJDIR = obj
Revised the MSVC Makefile and build * Generate icons.h and icons-proto.h in the source directory instead of obj/, so that pre-generated copies of these files can be distributed without being blown away by "make clean"; also updated the source files that #include these to reflect the new location * Compilation rules rewritten as batch-mode inference rules * Use Windows commands instead of Unix ones ("del" instead of "rm", "move" instead of "mv", etc.) * Sorted the object lists * Use tabs to indent rule bodies
2013-08-27 20:44:48 +00:00
W32OBJS = $(OBJDIR)\freeze.obj \
$(OBJDIR)\w32main.obj \
$(OBJDIR)\w32util.obj
This is my initial checkin for solvespace, a second attempt at constraint solver drawing. I've started work on the user inteface, which will be based around two windows: one with the graphical sketch, and one command line. I've started to implement the command line, no other work. [git-p4: depot-paths = "//depot/solvespace/": change = 1652]
2008-03-25 10:02:13 +00:00
Updated the bundled LibPNG/zlib, and polished the MSVC makefile further The bundled copies of LibPNG and zlib have been updated to the versions shipped with FLTK (as these were convenient to build), and I've put in new static libraries compiled with Visual Studio 2003 .NET. These libraries link cleanly even with Visual Studio 2013 Express, so they should work for just about every version of MSVC out there that can compile SolveSpace. The MSVC makefile is also now a little nicer, and the SpaceWare Input library header #includes have been adjusted to drop the si/ prefix (for consistency with how LibPNG/zlib are handled).
2013-11-13 05:33:23 +00:00
SSOBJS = $(OBJDIR)\bsp.obj \
Add support for a clipboard, with cut, copy, and paste. This works only in a workplane; but this means that plane sketches are conveniently transformed from one plane to another. Also tweak snap to grid to ignore unsnappable entities instead of triggering an error, and to remove arbitrary limit on the number of entities / comments that will be snapped. [git-p4: depot-paths = "//depot/solvespace/": change = 2084]
2009-12-04 08:08:41 +00:00
$(OBJDIR)\clipboard.obj \
Revised the MSVC Makefile and build * Generate icons.h and icons-proto.h in the source directory instead of obj/, so that pre-generated copies of these files can be distributed without being blown away by "make clean"; also updated the source files that #include these to reflect the new location * Compilation rules rewritten as batch-mode inference rules * Use Windows commands instead of Unix ones ("del" instead of "rm", "move" instead of "mv", etc.) * Sorted the object lists * Use tabs to indent rule bodies
2013-08-27 20:44:48 +00:00
$(OBJDIR)\confscreen.obj \
Now I can add a constraint (a length), and it's displayed on-screen, and I can drag the label. That's progress. Also implement a bunch of untested expression stuff, since I'll need that for the values of the dimensions, for example. [git-p4: depot-paths = "//depot/solvespace/": change = 1668]
2008-04-14 10:28:32 +00:00
$(OBJDIR)\constraint.obj \
Split constraint.cpp into two files: one for building the constraint structures based on user input, and one for generating equations from the constraints. [git-p4: depot-paths = "//depot/solvespace/": change = 1885]
2009-01-03 12:31:19 +00:00
$(OBJDIR)\constrainteq.obj \
Revised the MSVC Makefile and build * Generate icons.h and icons-proto.h in the source directory instead of obj/, so that pre-generated copies of these files can be distributed without being blown away by "make clean"; also updated the source files that #include these to reflect the new location * Compilation rules rewritten as batch-mode inference rules * Use Windows commands instead of Unix ones ("del" instead of "rm", "move" instead of "mv", etc.) * Sorted the object lists * Use tabs to indent rule bodies
2013-08-27 20:44:48 +00:00
$(OBJDIR)\describescreen.obj \
Split some large files. [git-p4: depot-paths = "//depot/solvespace/": change = 1777]
2008-06-06 08:14:37 +00:00
$(OBJDIR)\draw.obj \
Now I can add a constraint (a length), and it's displayed on-screen, and I can drag the label. That's progress. Also implement a bunch of untested expression stuff, since I'll need that for the values of the dimensions, for example. [git-p4: depot-paths = "//depot/solvespace/": change = 1668]
2008-04-14 10:28:32 +00:00
$(OBJDIR)\drawconstraint.obj \
Revised the MSVC Makefile and build * Generate icons.h and icons-proto.h in the source directory instead of obj/, so that pre-generated copies of these files can be distributed without being blown away by "make clean"; also updated the source files that #include these to reflect the new location * Compilation rules rewritten as batch-mode inference rules * Use Windows commands instead of Unix ones ("del" instead of "rm", "move" instead of "mv", etc.) * Sorted the object lists * Use tabs to indent rule bodies
2013-08-27 20:44:48 +00:00
$(OBJDIR)\drawentity.obj \
$(OBJDIR)\entity.obj \
$(OBJDIR)\export.obj \
$(OBJDIR)\exportstep.obj \
$(OBJDIR)\exportvector.obj \
$(OBJDIR)\expr.obj \
Rename some stuff in the IdList again. Rough in the file save stuff, though no file load stuff, and perhaps this can all be made to work from a table somehow. Move the quaternion stuff into its own class, and add a fancy animated view when you orient onto a csys. [git-p4: depot-paths = "//depot/solvespace/": change = 1672]
2008-04-18 11:11:48 +00:00
$(OBJDIR)\file.obj \
Revised the MSVC Makefile and build * Generate icons.h and icons-proto.h in the source directory instead of obj/, so that pre-generated copies of these files can be distributed without being blown away by "make clean"; also updated the source files that #include these to reflect the new location * Compilation rules rewritten as batch-mode inference rules * Use Windows commands instead of Unix ones ("del" instead of "rm", "move" instead of "mv", etc.) * Sorted the object lists * Use tabs to indent rule bodies
2013-08-27 20:44:48 +00:00
$(OBJDIR)\generate.obj \
$(OBJDIR)\glhelper.obj \
$(OBJDIR)\graphicswin.obj \
$(OBJDIR)\group.obj \
$(OBJDIR)\groupmesh.obj \
Add polygon triangulation, by cheating. I'm using the gl tesselator for that, and storing the triangles instead of rendering them immediately. Not sure if that's smart; in theory could change from implementation to implementation, but the results look much better than I would get myself. [git-p4: depot-paths = "//depot/solvespace/": change = 1733]
2008-05-22 10:28:28 +00:00
$(OBJDIR)\mesh.obj \
Revised the MSVC Makefile and build * Generate icons.h and icons-proto.h in the source directory instead of obj/, so that pre-generated copies of these files can be distributed without being blown away by "make clean"; also updated the source files that #include these to reflect the new location * Compilation rules rewritten as batch-mode inference rules * Use Windows commands instead of Unix ones ("del" instead of "rm", "move" instead of "mv", etc.) * Sorted the object lists * Use tabs to indent rule bodies
2013-08-27 20:44:48 +00:00
$(OBJDIR)\modify.obj \
$(OBJDIR)\mouse.obj \
$(OBJDIR)\polygon.obj \
$(OBJDIR)\request.obj \
$(OBJDIR)\solvespace.obj \
$(OBJDIR)\style.obj \
$(OBJDIR)\system.obj \
$(OBJDIR)\textscreens.obj \
$(OBJDIR)\textwin.obj \
$(OBJDIR)\toolbar.obj \
Add TrueType font support to SolveSpace. This uses a modified version of the code from SketchFlat, with all arbitrary limits removed. The TTF text is its own entity, and that entity includes the font file basename and the text. That's an extra 128 bytes in the entity, which is around a 50% increase, kind of a shame. It was simple, though. [git-p4: depot-paths = "//depot/solvespace/": change = 1814]
2008-06-30 09:09:17 +00:00
$(OBJDIR)\ttf.obj \
Revised the MSVC Makefile and build * Generate icons.h and icons-proto.h in the source directory instead of obj/, so that pre-generated copies of these files can be distributed without being blown away by "make clean"; also updated the source files that #include these to reflect the new location * Compilation rules rewritten as batch-mode inference rules * Use Windows commands instead of Unix ones ("del" instead of "rm", "move" instead of "mv", etc.) * Sorted the object lists * Use tabs to indent rule bodies
2013-08-27 20:44:48 +00:00
$(OBJDIR)\undoredo.obj \
$(OBJDIR)\util.obj \
$(OBJDIR)\view.obj
This is my initial checkin for solvespace, a second attempt at constraint solver drawing. I've started work on the user inteface, which will be based around two windows: one with the graphical sketch, and one command line. I've started to implement the command line, no other work. [git-p4: depot-paths = "//depot/solvespace/": change = 1652]
2008-03-25 10:02:13 +00:00
Revised the MSVC Makefile and build * Generate icons.h and icons-proto.h in the source directory instead of obj/, so that pre-generated copies of these files can be distributed without being blown away by "make clean"; also updated the source files that #include these to reflect the new location * Compilation rules rewritten as batch-mode inference rules * Use Windows commands instead of Unix ones ("del" instead of "rm", "move" instead of "mv", etc.) * Sorted the object lists * Use tabs to indent rule bodies
2013-08-27 20:44:48 +00:00
SRFOBJS = $(OBJDIR)\boolean.obj \
Split ratpoly.cpp; now that contains only the mathematical stuff, and curve.cpp and surface.cpp contain the rest. Also get rid of the meshError stuff; will just use the nakedEdges mechanism for that. And I won't run the interference test continuously, have added a menu item for that. [git-p4: depot-paths = "//depot/solvespace/": change = 1934]
2009-03-29 06:05:28 +00:00
$(OBJDIR)\curve.obj \
Revised the MSVC Makefile and build * Generate icons.h and icons-proto.h in the source directory instead of obj/, so that pre-generated copies of these files can be distributed without being blown away by "make clean"; also updated the source files that #include these to reflect the new location * Compilation rules rewritten as batch-mode inference rules * Use Windows commands instead of Unix ones ("del" instead of "rm", "move" instead of "mv", etc.) * Sorted the object lists * Use tabs to indent rule bodies
2013-08-27 20:44:48 +00:00
$(OBJDIR)\merge.obj \
$(OBJDIR)\ratpoly.obj \
$(OBJDIR)\raycast.obj \
Split ratpoly.cpp; now that contains only the mathematical stuff, and curve.cpp and surface.cpp contain the rest. Also get rid of the meshError stuff; will just use the nakedEdges mechanism for that. And I won't run the interference test continuously, have added a menu item for that. [git-p4: depot-paths = "//depot/solvespace/": change = 1934]
2009-03-29 06:05:28 +00:00
$(OBJDIR)\surface.obj \
More poking at Booleans; generate the unsplit intersection curves for planes against planes. [git-p4: depot-paths = "//depot/solvespace/": change = 1907]
2009-01-27 07:59:58 +00:00
$(OBJDIR)\surfinter.obj \
Revised the MSVC Makefile and build * Generate icons.h and icons-proto.h in the source directory instead of obj/, so that pre-generated copies of these files can be distributed without being blown away by "make clean"; also updated the source files that #include these to reflect the new location * Compilation rules rewritten as batch-mode inference rules * Use Windows commands instead of Unix ones ("del" instead of "rm", "move" instead of "mv", etc.) * Sorted the object lists * Use tabs to indent rule bodies
2013-08-27 20:44:48 +00:00
$(OBJDIR)\triangulate.obj
Entities now generate rational polynomial curves instead of piecwise linear segments. These are piecewise linear approximated for display, and currently for the mesh too, but that's the first step to replace the mesh with exact curved surfaces. [git-p4: depot-paths = "//depot/solvespace/": change = 1895]
2009-01-15 03:55:42 +00:00
Add an icon file (ugly, but at least it's not the default anymore). And add the manifest that gets us visual styles on the controls under Win32. [git-p4: depot-paths = "//depot/solvespace/": change = 1844]
2008-07-18 09:50:52 +00:00
RES = $(OBJDIR)\resource.res
Add a simple license key: I take the CRC of the license info, plus some magic numbers. This would be trivial to break, but still more difficult than patching the binary to skip the check... [git-p4: depot-paths = "//depot/solvespace/": change = 1853]
2008-02-09 13:52:01 +00:00
LIBS = user32.lib gdi32.lib comctl32.lib advapi32.lib shell32.lib opengl32.lib glu32.lib \
Reorganized the extlib/ subdirectory LibPNG and zlib have been moved into their own subdirectories, consistent with the SpaceWare Input library
2013-11-13 05:23:06 +00:00
extlib\libpng\libpng.lib extlib\zlib\zlib.lib
This is my initial checkin for solvespace, a second attempt at constraint solver drawing. I've started work on the user inteface, which will be based around two windows: one with the graphical sketch, and one command line. I've started to implement the command line, no other work. [git-p4: depot-paths = "//depot/solvespace/": change = 1652]
2008-03-25 10:02:13 +00:00
Updated the bundled LibPNG/zlib, and polished the MSVC makefile further The bundled copies of LibPNG and zlib have been updated to the versions shipped with FLTK (as these were convenient to build), and I've put in new static libraries compiled with Visual Studio 2003 .NET. These libraries link cleanly even with Visual Studio 2013 Express, so they should work for just about every version of MSVC out there that can compile SolveSpace. The MSVC makefile is also now a little nicer, and the SpaceWare Input library header #includes have been adjusted to drop the si/ prefix (for consistency with how LibPNG/zlib are handled).
2013-11-13 05:33:23 +00:00
# Note that the Perl scripts require the GD module.
#
#PERL = perl
Revised the MSVC Makefile and build * Generate icons.h and icons-proto.h in the source directory instead of obj/, so that pre-generated copies of these files can be distributed without being blown away by "make clean"; also updated the source files that #include these to reflect the new location * Compilation rules rewritten as batch-mode inference rules * Use Windows commands instead of Unix ones ("del" instead of "rm", "move" instead of "mv", etc.) * Sorted the object lists * Use tabs to indent rule bodies
2013-08-27 20:44:48 +00:00
Make optional the use of the SpaceNavigator libraries
2013-09-20 19:25:14 +00:00
!IFDEF HAVE_SPACEWARE_INPUT
DEFINES = $(DEFINES) -DHAVE_SPACEWARE_INPUT
LIBS = $(LIBS) extlib\si\siapp.lib
!ENDIF
Revised the MSVC Makefile and build * Generate icons.h and icons-proto.h in the source directory instead of obj/, so that pre-generated copies of these files can be distributed without being blown away by "make clean"; also updated the source files that #include these to reflect the new location * Compilation rules rewritten as batch-mode inference rules * Use Windows commands instead of Unix ones ("del" instead of "rm", "move" instead of "mv", etc.) * Sorted the object lists * Use tabs to indent rule bodies
2013-08-27 20:44:48 +00:00
all: $(OBJDIR)\solvespace.exe
@copy /y $(OBJDIR)\solvespace.exe .
@echo solvespace.exe
This is my initial checkin for solvespace, a second attempt at constraint solver drawing. I've started work on the user inteface, which will be based around two windows: one with the graphical sketch, and one command line. I've started to implement the command line, no other work. [git-p4: depot-paths = "//depot/solvespace/": change = 1652]
2008-03-25 10:02:13 +00:00
clean:
Revised the MSVC Makefile and build * Generate icons.h and icons-proto.h in the source directory instead of obj/, so that pre-generated copies of these files can be distributed without being blown away by "make clean"; also updated the source files that #include these to reflect the new location * Compilation rules rewritten as batch-mode inference rules * Use Windows commands instead of Unix ones ("del" instead of "rm", "move" instead of "mv", etc.) * Sorted the object lists * Use tabs to indent rule bodies
2013-08-27 20:44:48 +00:00
del /q obj\*
$(OBJDIR)\solvespace.exe: $(SSOBJS) $(SRFOBJS) $(W32OBJS) $(RES)
$(CXX) $(DEFINES) $(CXXFLAGS) /Fe$(OBJDIR)\solvespace.exe $(SSOBJS) $(SRFOBJS) $(W32OBJS) $(RES) $(LIBS)
editbin /nologo /STACK:8388608 $(OBJDIR)\solvespace.exe
This is my initial checkin for solvespace, a second attempt at constraint solver drawing. I've started work on the user inteface, which will be based around two windows: one with the graphical sketch, and one command line. I've started to implement the command line, no other work. [git-p4: depot-paths = "//depot/solvespace/": change = 1652]
2008-03-25 10:02:13 +00:00
Revised the MSVC Makefile and build * Generate icons.h and icons-proto.h in the source directory instead of obj/, so that pre-generated copies of these files can be distributed without being blown away by "make clean"; also updated the source files that #include these to reflect the new location * Compilation rules rewritten as batch-mode inference rules * Use Windows commands instead of Unix ones ("del" instead of "rm", "move" instead of "mv", etc.) * Sorted the object lists * Use tabs to indent rule bodies
2013-08-27 20:44:48 +00:00
{.}.cpp{$(OBJDIR)}.obj::
$(CXX) $(CXXFLAGS) $(DEFINES) /c /Fo$(OBJDIR)\ $<
This is my initial checkin for solvespace, a second attempt at constraint solver drawing. I've started work on the user inteface, which will be based around two windows: one with the graphical sketch, and one command line. I've started to implement the command line, no other work. [git-p4: depot-paths = "//depot/solvespace/": change = 1652]
2008-03-25 10:02:13 +00:00
Revised the MSVC Makefile and build * Generate icons.h and icons-proto.h in the source directory instead of obj/, so that pre-generated copies of these files can be distributed without being blown away by "make clean"; also updated the source files that #include these to reflect the new location * Compilation rules rewritten as batch-mode inference rules * Use Windows commands instead of Unix ones ("del" instead of "rm", "move" instead of "mv", etc.) * Sorted the object lists * Use tabs to indent rule bodies
2013-08-27 20:44:48 +00:00
{srf}.cpp{$(OBJDIR)}.obj::
$(CXX) $(CXXFLAGS) $(DEFINES) /c /Fo$(OBJDIR)\ $<
This is my initial checkin for solvespace, a second attempt at constraint solver drawing. I've started work on the user inteface, which will be based around two windows: one with the graphical sketch, and one command line. I've started to implement the command line, no other work. [git-p4: depot-paths = "//depot/solvespace/": change = 1652]
2008-03-25 10:02:13 +00:00
Revised the MSVC Makefile and build * Generate icons.h and icons-proto.h in the source directory instead of obj/, so that pre-generated copies of these files can be distributed without being blown away by "make clean"; also updated the source files that #include these to reflect the new location * Compilation rules rewritten as batch-mode inference rules * Use Windows commands instead of Unix ones ("del" instead of "rm", "move" instead of "mv", etc.) * Sorted the object lists * Use tabs to indent rule bodies
2013-08-27 20:44:48 +00:00
{win32}.cpp{$(OBJDIR)}.obj::
$(CXX) $(CXXFLAGS) $(DEFINES) /c /Fo$(OBJDIR)\ $<
Entities now generate rational polynomial curves instead of piecwise linear segments. These are piecewise linear approximated for display, and currently for the mesh too, but that's the first step to replace the mesh with exact curved surfaces. [git-p4: depot-paths = "//depot/solvespace/": change = 1895]
2009-01-15 03:55:42 +00:00
Revised the MSVC Makefile and build * Generate icons.h and icons-proto.h in the source directory instead of obj/, so that pre-generated copies of these files can be distributed without being blown away by "make clean"; also updated the source files that #include these to reflect the new location * Compilation rules rewritten as batch-mode inference rules * Use Windows commands instead of Unix ones ("del" instead of "rm", "move" instead of "mv", etc.) * Sorted the object lists * Use tabs to indent rule bodies
2013-08-27 20:44:48 +00:00
$(RES): win32\$(@B).rc icon.ico
$(RC) /fo$@ win32\$(@B).rc
This is my initial checkin for solvespace, a second attempt at constraint solver drawing. I've started work on the user inteface, which will be based around two windows: one with the graphical sketch, and one command line. I've started to implement the command line, no other work. [git-p4: depot-paths = "//depot/solvespace/": change = 1652]
2008-03-25 10:02:13 +00:00
Renamed *.table files to *.table.h The *.table files are in fact C header files, and with an *.h extension, tools will be able to recognize them as such
2013-09-16 21:14:53 +00:00
$(OBJDIR)\glhelper.obj: bitmapextra.table.h bitmapfont.table.h font.table.h
Add an icon file (ugly, but at least it's not the default anymore). And add the manifest that gets us visual styles on the controls under Win32. [git-p4: depot-paths = "//depot/solvespace/": change = 1844]
2008-07-18 09:50:52 +00:00
Revised the MSVC Makefile and build * Generate icons.h and icons-proto.h in the source directory instead of obj/, so that pre-generated copies of these files can be distributed without being blown away by "make clean"; also updated the source files that #include these to reflect the new location * Compilation rules rewritten as batch-mode inference rules * Use Windows commands instead of Unix ones ("del" instead of "rm", "move" instead of "mv", etc.) * Sorted the object lists * Use tabs to indent rule bodies
2013-08-27 20:44:48 +00:00
$(OBJDIR)\textwin.obj: icons.h
Initial work to move text window guts into platform-independent code. This is now drawn using gl, and the bitmap font (both there and in the graphics window) is drawn from a texture from a static table, not from the Win32 functions, since that's ~1000x faster. So this adds a tool to generate that table. With luck that will also fix my font issues under WINE, which won't have to render the TTF itself. Still needs some cleanup, and to make all the cosmetic improvements that I want. [git-p4: depot-paths = "//depot/solvespace/": change = 2130]
2010-04-26 07:52:49 +00:00
Revised the MSVC Makefile and build * Generate icons.h and icons-proto.h in the source directory instead of obj/, so that pre-generated copies of these files can be distributed without being blown away by "make clean"; also updated the source files that #include these to reflect the new location * Compilation rules rewritten as batch-mode inference rules * Use Windows commands instead of Unix ones ("del" instead of "rm", "move" instead of "mv", etc.) * Sorted the object lists * Use tabs to indent rule bodies
2013-08-27 20:44:48 +00:00
$(OBJDIR)\toolbar.obj: icons.h
Major UI changes, to use the checkboxes and radio buttons wherever possible. This replaces all of the color-coded links, that I liked but that were nonstandard. Also rip out the old sweep and helical sweep UI; that was disabled, but the code was still present. And fix dependencies in makefile, since textwin.cpp depends on the icons now. [git-p4: depot-paths = "//depot/solvespace/": change = 2139]
2010-05-09 18:25:23 +00:00
Updated the bundled LibPNG/zlib, and polished the MSVC makefile further The bundled copies of LibPNG and zlib have been updated to the versions shipped with FLTK (as these were convenient to build), and I've put in new static libraries compiled with Visual Studio 2003 .NET. These libraries link cleanly even with Visual Studio 2013 Express, so they should work for just about every version of MSVC out there that can compile SolveSpace. The MSVC makefile is also now a little nicer, and the SpaceWare Input library header #includes have been adjusted to drop the si/ prefix (for consistency with how LibPNG/zlib are handled).
2013-11-13 05:33:23 +00:00
!IFDEF PERL
Revised the MSVC Makefile and build * Generate icons.h and icons-proto.h in the source directory instead of obj/, so that pre-generated copies of these files can be distributed without being blown away by "make clean"; also updated the source files that #include these to reflect the new location * Compilation rules rewritten as batch-mode inference rules * Use Windows commands instead of Unix ones ("del" instead of "rm", "move" instead of "mv", etc.) * Sorted the object lists * Use tabs to indent rule bodies
2013-08-27 20:44:48 +00:00
icons.h: icons\*.png png2c.pl
$(PERL) png2c.pl $@ icons-proto.h
Initial work to move text window guts into platform-independent code. This is now drawn using gl, and the bitmap font (both there and in the graphics window) is drawn from a texture from a static table, not from the Win32 functions, since that's ~1000x faster. So this adds a tool to generate that table. With luck that will also fix my font issues under WINE, which won't have to render the TTF itself. Still needs some cleanup, and to make all the cosmetic improvements that I want. [git-p4: depot-paths = "//depot/solvespace/": change = 2130]
2010-04-26 07:52:49 +00:00
Renamed *.table files to *.table.h The *.table files are in fact C header files, and with an *.h extension, tools will be able to recognize them as such
2013-09-16 21:14:53 +00:00
bitmapextra.table.h: icons\*.png pngchar2c.pl
Revised the MSVC Makefile and build * Generate icons.h and icons-proto.h in the source directory instead of obj/, so that pre-generated copies of these files can be distributed without being blown away by "make clean"; also updated the source files that #include these to reflect the new location * Compilation rules rewritten as batch-mode inference rules * Use Windows commands instead of Unix ones ("del" instead of "rm", "move" instead of "mv", etc.) * Sorted the object lists * Use tabs to indent rule bodies
2013-08-27 20:44:48 +00:00
$(PERL) pngchar2c.pl >tmp.$@
move /y tmp.$@ $@
Add a toolbar. This requires a tool to convert my PNG icons to tables in the code, which I have written in perl and am checking in. Also get WM_MOUSELEAVE events from win32, so that I can de-hover everything when the mouse leaves the graphics window. And fix one of the icons, which was 23x24 instead of 24x24. [git-p4: depot-paths = "//depot/solvespace/": change = 1883]
2009-01-02 10:38:36 +00:00
Updated the bundled LibPNG/zlib, and polished the MSVC makefile further The bundled copies of LibPNG and zlib have been updated to the versions shipped with FLTK (as these were convenient to build), and I've put in new static libraries compiled with Visual Studio 2003 .NET. These libraries link cleanly even with Visual Studio 2013 Express, so they should work for just about every version of MSVC out there that can compile SolveSpace. The MSVC makefile is also now a little nicer, and the SpaceWare Input library header #includes have been adjusted to drop the si/ prefix (for consistency with how LibPNG/zlib are handled).
2013-11-13 05:33:23 +00:00
!ENDIF # PERL