Author: matt
Date: 2012-06-15 14:51:44 -0700 (Fri, 15 Jun 2012)
New Revision: 9616
Log:
Attempt to fix MinGW setup.
Modified:
branches/branch-3.0/fltk.flw
branches/branch-3.0/test/Makefile
Modified: branches/branch-3.0/fltk.flw
===================================================================
--- branches/branch-3.0/fltk.flw 2012-06-15 21:11:24 UTC (rev 9615)
+++ branches/branch-3.0/fltk.flw 2012-06-15 21:51:44 UTC (rev 9616)
@@ -2,7 +2,7 @@
version 3.0000
header_name {.h}
code_name {.cxx}
-workspace FLTK {open
+workspace FLTK {open selected
uuid_Xcode4_Root {2204C862-3EAB-44CD-B0A8-6DF16FFDC8F4}
uuid_Xcode4_ProductsGroup {A3B55F76-F5F9-4F9E-8A45-2778583213A1}
uuid_Xcode4_Group {341D2CD3-06FB-47E4-B35C-D1F9B51C7293}
@@ -5655,7 +5655,7 @@
uuid_Xcode4_ContainerItemProxy {280A81DE-05D7-4633-93A2-1C51596432A5}
uuid_Xcode4_TargetDependency {691D7169-3A68-40F4-895C-D8B0975D0C0E}
}
- file_ref {ws2_32.lib} {selected
+ file_ref {ws2_32.lib} {
uuid_Xcode4_BuildFile {0124A007-B34A-4DE1-88FC-C30114BDB55B}
uuid_Xcode4_FileRef {C6A5409C-2471-45E7-B4BC-9D8776188EF4}
uuid_Xcode4_BuildFileInFrameworks
{EB58990F-7CE7-4F05-8B69-1B0E1213F98A}
@@ -5664,6 +5664,11 @@
filename_and_path {ws2_32.lib}
location 3
}
+ tool_option {Makefile Connect libraries} {
+ build_env 1
+ value {$(CONNECTLIB)}
+ valuetype 2
+ }
}
app_target cube {
uuid_Xcode4_FluidBuildRule {C4ADBFB6-1C2C-4F53-8D6C-25380F160B1E}
Modified: branches/branch-3.0/test/Makefile
===================================================================
--- branches/branch-3.0/test/Makefile 2012-06-15 21:11:24 UTC (rev 9615)
+++ branches/branch-3.0/test/Makefile 2012-06-15 21:51:44 UTC (rev 9616)
@@ -332,7 +332,7 @@
connect$(EXEEXT): connect.o $(FLTK3_LIB_NAME) $(FLTK3CONNECT_LIB_NAME)
echo Linking $@...
- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ connect.o $(LINK_FLTK3)
$(LINK_FLTK3CONNECT) $(LDLIBS)
+ $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ connect.o $(LINK_FLTK3)
$(LINK_FLTK3CONNECT) $(CONNECTLIB) $(LDLIBS)
cube$(EXEEXT): cube.o $(FLTK3_LIB_NAME) $(FLTK3GL_LIB_NAME)
echo Linking $@...
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
